Commit Graph

8248 Commits

Author SHA1 Message Date
LetterJay 0c43d1ef92 Merge pull request #5088 from Citadel-Station-13/upstream-merge-34838
[MIRROR] Fixes poly's ghost SM spam
2018-01-24 21:43:07 -06:00
LetterJay c2df8bbacc Merge pull request #5087 from Citadel-Station-13/upstream-merge-34848
[MIRROR] Adds new landmark icons
2018-01-24 21:42:12 -06:00
LetterJay 2c40834c5a Merge pull request #5085 from Citadel-Station-13/upstream-merge-34699
[MIRROR] Rename /datum/config_entry/var/value to config_entry_value
2018-01-24 21:41:33 -06:00
LetterJay cf02adf419 Merge pull request #5081 from Citadel-Station-13/upstream-merge-34744
[MIRROR] shuttles will now throw you if you don't buckle in
2018-01-24 20:48:15 -06:00
LetterJay b89007ade5 Merge pull request #5080 from Citadel-Station-13/upstream-merge-34746
[MIRROR] Makes the autolathe repeat it's animation while it's still printing.
2018-01-24 20:48:03 -06:00
LetterJay 114a1fe049 Merge pull request #5078 from Citadel-Station-13/upstream-merge-34776
[MIRROR] Corrects mapGeneratorModule generate() args
2018-01-24 20:47:17 -06:00
LetterJay 2d754ec8ca Merge pull request #5077 from Citadel-Station-13/upstream-merge-34801
[MIRROR] Fixes compatability issues with some third-party-java-based™ DMM viewers
2018-01-24 20:46:59 -06:00
LetterJay 793b4be13f Merge pull request #5066 from Citadel-Station-13/upstream-merge-34773
[MIRROR] Shifts vars off /mob to the correct subtype
2018-01-24 20:46:46 -06:00
LetterJay 7ec4e826c3 Merge pull request #5067 from Citadel-Station-13/upstream-merge-34690
[MIRROR] New Cocktail: The Nar'Sour
2018-01-24 20:46:27 -06:00
LetterJay dd31c777a5 Merge pull request #5068 from Citadel-Station-13/upstream-merge-34807
[MIRROR] Fixes the kitchen spike turning people upside down forever
2018-01-24 20:46:16 -06:00
LetterJay 0bf04c6aa6 Merge pull request #5076 from Citadel-Station-13/upstream-merge-34579
[MIRROR] Adds Ketrazine, a powerful combat stimulant with severe side-effects which can be synthesized by the crew
2018-01-24 20:45:51 -06:00
LetterJay 8f62c0823a Merge pull request #5075 from Citadel-Station-13/upstream-merge-34800
[MIRROR] martial art sanity check
2018-01-24 20:45:33 -06:00
LetterJay f0b83ee23d Merge pull request #5074 from Citadel-Station-13/upstream-merge-34611
[MIRROR] One can no longer use cogscarab as a form of Eminence priority.
2018-01-24 20:45:16 -06:00
LetterJay 205afc5dc8 Merge pull request #5073 from Citadel-Station-13/upstream-merge-34818
[MIRROR] Plasma cutter now has a tool sound
2018-01-24 20:44:59 -06:00
LetterJay d573e67ff6 Merge pull request #5072 from Citadel-Station-13/upstream-merge-34487
[MIRROR] Costumes for nuclear operatives
2018-01-24 20:44:43 -06:00
LetterJay cbaca56dbf Merge pull request #5071 from Citadel-Station-13/upstream-merge-34458
[MIRROR] Refactors and nerfs Fleshmend
2018-01-24 20:44:30 -06:00
LetterJay ad50662c94 Merge pull request #5070 from Citadel-Station-13/upstream-merge-34285
[MIRROR] Gives clockwork marauders a reasonable cost/cooldown
2018-01-24 20:44:15 -06:00
Jordan Brown fa3693c00f Merge pull request #34838 from ShizCalev/sm-godmode-fix
Fixes poly's ghost SM spam
2018-01-24 18:08:41 -06:00
ShizCalev 6ed56158e3 Adds new landmark icons (#34848)
* Adds new landmark icons

* Update

* Blue
2018-01-24 18:08:33 -06:00
Jordan Brown 3b0a00d53c Rename /datum/config_entry/var/value to config_entry_value (#34699)
This works around some vv-fu you can use to pass in a config_entry to a proc that reads the value var of some other datum. Byond is stupid enough to actually read it, so it must be uniquely named.
2018-01-24 15:41:19 -06:00
LetterJay 072056f919 Update fleshmend.dm 2018-01-24 15:40:05 -06:00
LetterJay 912fb88cc1 Update stamps.dm 2018-01-24 15:39:45 -06:00
MoreRobustThanYou 53d37098fc Shuttles will now throw you when taking off
🆑 SPACE CONDUCTOR
tweak: Shuttles will throw you around if ya don't buckle in
/🆑
2018-01-24 14:15:51 -06:00
oranges 8b2da0aa90 Merge pull request #34746 from DaxDupont/autolathe
Makes the autolathe repeat it's animation while it's still printing.
2018-01-24 14:14:37 -06:00
Leo cb43e02276 Merge pull request #34776 from ShizCalev/mapGeneratorModule-args
Corrects mapGeneratorModule generate() args
2018-01-24 14:11:08 -06:00
Leo 2a0da701b2 Merge pull request #34801 from ShizCalev/DMM-viewer-fix
Fixes compatability issues with some third-party-java-based™ DMM viewers
2018-01-24 14:09:51 -06:00
Ordonis 00d1e8f902 Adds Ketrazine, a powerful combat stimulant with severe side-effects which can be synthesized by the crew (#34579)
🆑 Ordo
rscadd: Adds Ketrazine, a powerful but dangerous combat stim which the crew can synthesize
/🆑
2018-01-24 14:08:38 -06:00
Leo c3ba7008d1 Merge pull request #34800 from ShizCalev/everybody-was-kungfoo-fighting
martial art sanity check
2018-01-24 14:07:24 -06:00
ExcessiveUseOfCobblestone eb1a6b89ef One can no longer use cogscarab as a form of Eminence priority. (#34611)
Cogscarabs are meant to build, and wasting an integral (building) slot for something you can get as a ghost so you get priority is shitty to both other ghosts and team (the second one being an admin issue).

If you want to go eminence, you can roll for it as a ghost like everyone else.
2018-01-24 14:03:08 -06:00
ACCount12 f69e5260e2 Plasma cutter now has a tool sound 2018-01-24 14:00:51 -06:00
LetterJay 9652fc4127 Merge pull request #5064 from Citadel-Station-13/upstream-merge-34783
[MIRROR] Cleans up duplicated code and GC issues
2018-01-24 13:59:44 -06:00
LetterJay 646aa3f2f8 Update alcohol_reagents.dm 2018-01-24 13:58:47 -06:00
coiax 481f73aba0 Costumes for nuclear operatives 2018-01-24 13:58:35 -06:00
LetterJay 85a7788dd3 Merge branch 'master' into upstream-merge-34773 2018-01-24 13:58:12 -06:00
LetterJay 937d6c473a Merge pull request #5048 from Citadel-Station-13/upstream-merge-34769
[MIRROR] Cleans up unused mob vars
2018-01-24 13:56:23 -06:00
Ashe Higgs be9f8a2d06 Refactors and nerfs Fleshmend 2018-01-24 13:56:20 -06:00
LetterJay b898e53be0 Merge pull request #5065 from Citadel-Station-13/upstream-merge-34775
[MIRROR] Removed named args from visible_message
2018-01-24 13:54:34 -06:00
LetterJay 955e9ae09a Merge pull request #5063 from Citadel-Station-13/upstream-merge-34777
[MIRROR] Corrects invalid process_fire args
2018-01-24 13:54:23 -06:00
LetterJay 3993b42729 Merge pull request #5061 from Citadel-Station-13/upstream-merge-34826
[MIRROR] Makes the soapstone engravings use examine to show the dialog
2018-01-24 13:54:08 -06:00
LetterJay 1e2f180f16 Merge pull request #5060 from Citadel-Station-13/upstream-merge-34819
[MIRROR] Makes photocopier use default_unfasten_wrench
2018-01-24 13:53:48 -06:00
LetterJay 9c541bd1b2 Merge pull request #5057 from Citadel-Station-13/upstream-merge-34795
[MIRROR] Fixes no eye damage being done if damage was exactly 3
2018-01-24 13:53:11 -06:00
Robustin f8c349ea54 Gives clockwork marauders a reasonable cost/cooldown (#34285)
balance: Clockwork marauders now take more time (+3s) and power (7x) to create.
balance: The "recent marauder" time limit is now 60 seconds, up from 20. The limit now has a significantly smaller effect on summon time but will act as a further cap on marauder summoning until it has passed.
tweak: The marauder cap will now only account for living cultists.
2018-01-24 13:53:03 -06:00
LetterJay c34007cf4f Merge pull request #5056 from Citadel-Station-13/upstream-merge-34796
[MIRROR] Fixes emergency lights having null brightness
2018-01-24 13:52:55 -06:00
LetterJay ee253a6c54 Merge pull request #5055 from Citadel-Station-13/upstream-merge-34808
[MIRROR] Abstract landmarks are now indestructible
2018-01-24 13:52:41 -06:00
LetterJay 8315716380 Merge pull request #5053 from Citadel-Station-13/upstream-merge-34766
[MIRROR] Xeno nests are no longer held together by bolts.
2018-01-24 13:51:48 -06:00
LetterJay 2234e522b8 Merge pull request #5052 from Citadel-Station-13/upstream-merge-34817
[MIRROR] Makes the point effect not trigger movement code
2018-01-24 13:51:34 -06:00
KorPhaeron 7267f4a5f3 Fixes the kitchen spike turning people upside down forever (#34807) 2018-01-24 13:02:39 -06:00
Robustin fb5195aa4e New Cocktail: The Nar'Sour 2018-01-24 12:56:21 -06:00
ShizCalev cae2e5e1eb Shifts vars off /mob to the correct subtype 2018-01-24 12:00:05 -06:00
Leo e71ce4e8cf Merge pull request #34775 from ShizCalev/removed-named-args-from-visible_message
Removed named args from visible_message
2018-01-24 11:59:50 -06:00