Commit Graph

28851 Commits

Author SHA1 Message Date
Jack Edge ba673a04d1 Removes requirements for exports to be contained
🆑 coiax
rscadd: All items in the supply shuttle are processed for export,
irregardless of whether they are in a container or not.
/🆑
2016-06-26 12:40:13 +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
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
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
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
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
Joan Lung eed03c826a armless 2016-06-25 11:34:17 -04: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
KorPhaeron a41bf5b4d2 Revert "Revert "Pope Quick-fix"" 2016-06-24 23:38:26 -04:00
militaires 7c29cf4009 i aint got no shots to pop ya so deal with you own sucking problem
cmon motherfuckers cmon
2016-06-25 02:46:12 +03:00
Joan Lung c76293df4e this was godawful inefficient why'd nobody call me on it 2016-06-24 18:59:55 -04:00
Joan Lung a1d4dfd525 Interdiction Lenses no longer cause color flash 2016-06-24 17:45:57 -04:00
Cheridan 22e370b8b7 Merge pull request #18866 from Jordie0608/idkwhythiswasntathingalreadyicanthinkofareasonwhynot
Adds edit to job tempbans
2016-06-24 13:26:38 -05:00
Cheridan cf437557e3 Merge pull request #18865 from ChangelingRain/stunborg
Flashes now once again stun borgs
2016-06-24 13:01:46 -05:00
Jack Edge 48b2191101 Compile fixes III 2016-06-24 16:02:56 +01:00
Jack Edge 332fe14c8e Ratvar chanting is understood by servants
So this adds the clockwork_say() proc to clock_unsorted.dm which
modifies a speaker's language temporarily to speak RATVAR only.

This means that any non-servants who hear anything clockwork said will
still hear the old rot13 that we know and love. But it means that
servants will understand their chants.

If spoken outloud, invocations also use ROBOT span for that gutteral
clockwork feel and use the clockwork speech bubbles.

This will mean that observers understand scripture now.
2016-06-24 15:52:14 +01:00
Joan Lung dddefbe802 aRms 2016-06-24 10:26:08 -04:00
Joan Lung 702245e9ed comment 2016-06-24 09:38:56 -04:00
Jack Edge 6e0496dcd8 Compile fixes II 2016-06-24 14:34:15 +01:00
Joan Lung 6fa0025759 Fellowship Armory now provides gauntlets and invokes faster for each nearby servant 2016-06-24 09:31:56 -04:00
Jack Edge 67a5079598 Compile fixes I 2016-06-24 14:13:02 +01:00
Jack Edge a841bd14f5 Code cleanup; silicons, melee, hallucinations
- Cleaned up paint.dm
- Everything else should be self explanatory
- Removed braindamage part of esword, since you can't reach that; it
  would be handled by attack_self()
2016-06-24 14:03:44 +01:00