coffeeshits/kiwistation
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
36,356 Commits 9 Branches 11 Tags
339dfb24a37cd192885b4b8d1cf94f50ec604da3
Commit Graph

28870 Commits

Author SHA1 Message Date
Cheridan 339dfb24a3 Merge pull request #18919 from coiax/big-graffiti-nerf 
Changes to large graffiti
 2016-06-26 16:09:25 -05:00
Cheridan 6f1bafff4f Merge pull request #18915 from coiax/shuttle-processing 
Automation for shuttle templates, bunch of other shuttle stuff
 2016-06-26 15:12:51 -05:00
Cheridan 4f6828afcd Merge pull request #18899 from Incoming5643/patch-13 
Removes crappy hard defines from telescience
 2016-06-26 14:41:27 -05:00
Jack Edge 673492ea52 Code review II 
Because Joan is a stickler for sprite accuracy.
 2016-06-26 20:19:59 +01:00
Cheridan 7df85cfb34 Merge pull request #18895 from ChangelingRain/flashlesslens 
Interdiction Lenses no longer cause color flash and shouldn't lag quite as much
 2016-06-26 00:19:39 -05:00
Joan Lung 28bef926ff Merge pull request #18907 from tgstation/revert-18853-revert-18840-master 
Revert "Revert "Pope Quick-fix""
 2016-06-25 23:13:58 -04:00
Cheridan 097801fd49 Merge pull request #18871 from swankcookie/mining_hardsuit_fix 
Gives Mining Hardsuits the same fire protection as Explorer suits
 2016-06-25 20:49:31 -05:00
Jack Edge a09544992c Merge branch 'master' into shuttle-processing 
Conflicts:
	code/modules/shuttle/ripple.dm
 2016-06-26 01:00:25 +01:00
Joan Lung 36055a6b15 Merge pull request #18897 from Militaires/aliumfix 
Changes the alien queen maidify prompt to an action button
 2016-06-25 18:56:50 -04:00
Joan Lung 193013c6b0 Multiple color flashes won't make one permanent (#18894) 2016-06-25 18:56:07 -04:00
Razharas 9440a2724c Merge pull request #18890 from ChangelingRain/fellowshipofarms 
Fellowship Armory now provides gauntlets and invokes faster for each nearby servant
 2016-06-26 00:14:46 +03:00
Jack Edge 0d10a1f950 Changes to large graffiti 
🆑 coiax
rscdel: Large graffiti now consumes 5 uses from limited use crayons and
spraycans, as well as taking three times the amount of time to draw.
/🆑

- Also fixes bug where clown colorful reagent wasn't being applied to
all three turfs.
 2016-06-25 21:54:49 +01:00
Joan Lung be2466b97c Merge pull request #18889 from coiax/cleanup-2 
Code cleanup; silicons, melee, hallucinations
 2016-06-25 15:42:49 -04:00
Jack Edge 415d88ddb6 Code review I 2016-06-25 20:26:59 +01:00
Joan Lung 1bcf91f574 Merge pull request #18814 from coiax/tips 
Fun->Show Tip verb added
 2016-06-25 15:12:17 -04:00
Joan Lung d3c66c225e Merge pull request #18885 from coiax/nuke-realness 
Nuke disk suicide, better log messages
 2016-06-25 14:53:07 -04:00
Joan Lung fc46c2c145 Merge pull request #18884 from coiax/slower-shuttles 
Changes default shuttle transit time to 15 seconds
 2016-06-25 14:51:56 -04:00
Joan Lung 591763e4e3 Merge pull request #18882 from coiax/qdelin 
Adds QDEL_IN(time) macro; more spawn() removal
 2016-06-25 14:44:26 -04:00
Joan Lung df5afefc4d Merge pull request #18883 from coiax/domination-time 
Gang domination now uses world.time
 2016-06-25 14:43:40 -04:00
Joan Lung 44ff3f3bca Merge pull request #18887 from coiax/cleaning-1 
Code cleaning; countdown for transformer
 2016-06-25 14:43:26 -04:00
Jack Edge f34cc67333 Merge branch 'master' into qdelin 
Conflicts:
	code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm
 2016-06-25 19:29:46 +01:00
Joan Lung a9a3f01f0e where will my relentless incompetence end 2016-06-25 14:24:19 -04:00
Joan Lung a014733eae fix 2016-06-25 14:21:53 -04:00
Jack Edge a78b2a65fd Code review I 2016-06-25 19:21:19 +01:00
Joan Lung 9cffcbf3ff Merge branch 'master' of https://github.com/tgstation/tgstation into fellowshipofarms 
Conflicts:
	code/game/gamemodes/clock_cult/clock_scripture.dm
 2016-06-25 14:16:33 -04:00
Joan Lung 585c8a1656 Merge pull request #18891 from coiax/genafyngvba 
Clockwork mobs language sound like Ratvar chants if you don't understand it
 2016-06-25 14:12:28 -04:00
Jack Edge c9ec47e6a4 Ratvar chants are always untranslated 
And ironically, the best way to ensure this is that everyone understands
it.
 2016-06-25 19:04:00 +01:00
Jack Edge ef15462ec7 Fix some potential runtimes 2016-06-25 18:23:01 +01:00
Jack Edge 86cc2dd09a Ripples are overlay/temp 2016-06-25 18:18:44 +01:00
Jack Edge 241966945a All access "greentext" on clown brig 2016-06-25 18:13:08 +01:00
Jack Edge 93ed77f8db World timer for toys 2016-06-25 17:59:28 +01:00
Jack Edge 7aef42ae8b spawn() removal on effects_*.dm 2016-06-25 17:50:47 +01:00
Jack Edge c374782ebf A lot of shuttle changes 2016-06-25 17:28:46 +01:00
Joan Lung c08a38c271 Fixes drake fireballs becoming invisible (#18913) 
* Fixes drake fireballs becoming invisible

* how do I successfully code anything
it's probably the constant self-review
 2016-06-25 12:11:17 -04:00
Jack Edge 201da77121 Fixing some bugs with sparkles 2016-06-25 16:51:19 +01:00
Joan Lung eed03c826a armless 2016-06-25 11:34:17 -04:00
Jack Edge 27d6c284ed Merge branch 'fun-balloon' into shuttle-processing 
Conflicts:
	_maps/shuttles/emergency_bar.dmm
	_maps/shuttles/emergency_narnar.dmm
	code/modules/spells/spell_types/wizard.dm
 2016-06-25 16:26:22 +01:00
militaires 7d716443af Merge branch 'master' of https://github.com/tgstation/-tg-station into aliumfix 
# Conflicts:
#	icons/mob/actions.dmi
 2016-06-25 14:47:38 +03:00
Jack Edge a1684508e5 Fixing dragons 2016-06-25 12:44:08 +01:00
Jack Edge 4c8d04e6ee Compile fixes I 2016-06-25 11:57:09 +01:00
Jack Edge 0ec6f9d8a3 Code review 2016-06-25 11:57:09 +01:00
Jack Edge df9bd80c03 More spawn() removal and timers and stuff 2016-06-25 11:55:21 +01:00
Jack Edge 958b7bfc82 Makes things use QDEL_IN 2016-06-25 11:53:31 +01:00
Jack Edge 2d5f8c3684 Compile fixes I 2016-06-25 11:52:15 +01:00
Jack Edge 834fca9cb3 Nuke disk suicide, better log messages 
🆑 coiax
rscadd: Please do not commit suicide with the nuclear authentication
disk.
/🆑

- Nuke disk suicide
- Also, made a difference in the admin logs between a disk that has been
  destroyed, and one that has been taken out of bounds
 2016-06-25 11:52:09 +01:00
Jack Edge 177dcbe16b Bug fixes 2016-06-25 11:40:09 +01:00
Jack Edge 87016bc6cd Code cleaning; countdown for transformer 
🆑 coiax
rscadd: Observers now have a visible countdown for borg factories,
silicons can examine the factory to determine how long it has remaining
until it is ready.
/🆑

- Removes a bunch of spawns and trailing returns
 2016-06-25 11:40:03 +01:00
oranges 0af5b15efc Merge pull request #18874 from ChangelingRain/wikilink 
Roundstart Servants of Ratvar get a link to the wiki page
 2016-06-25 17:34:59 +12:00
oranges a90a23134d Merge pull request #18876 from ChangelingRain/stablemine 
Stabilizing Serum is named properly in the mining vendor
 2016-06-25 17:34:43 +12:00
oranges 9427c39155 Merge pull request #18872 from ChangelingRain/poolorgib 
Pools several unpooled overlay/temp objects
 2016-06-25 17:34:30 +12:00