Commit Graph

12597 Commits

Author SHA1 Message Date
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
CitadelStationBot 8ddea31807 Automatic changelog generation for PR #5071 [ci skip] 2018-01-24 20:44:32 -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
CitadelStationBot 8af82a912a Automatic changelog generation for PR #5070 [ci skip] 2018-01-24 20:44:18 -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
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
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
coiax 481f73aba0 Costumes for nuclear operatives 2018-01-24 13:58:35 -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
CitadelStationBot 8695d0214b Automatic changelog generation for PR #5061 [ci skip] 2018-01-24 13:54:11 -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 eda5ac3b5d Merge pull request #5058 from Citadel-Station-13/upstream-merge-34825
[MIRROR] Buffs the Contributing Guide (Fixes a typo)
2018-01-24 13:53:35 -06:00
CitadelStationBot 01d2d0f8fa Automatic changelog generation for PR #5057 [ci skip] 2018-01-24 13:53:14 -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
CitadelStationBot 84a5913680 Gives clockwork marauders a reasonable cost/cooldown 2018-01-24 13:53:03 -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
CitadelStationBot 1d703c0fe2 Automatic changelog generation for PR #5056 [ci skip] 2018-01-24 13:52:57 -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
CitadelStationBot c115c77ccd Automatic changelog generation for PR #5052 [ci skip] 2018-01-24 13:51:36 -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
CitadelStationBot 76a9cdd52d Automatic changelog generation for PR #5051 [ci skip] 2018-01-24 13:51:06 -06:00
LetterJay 0414803a1f Merge pull request #5051 from Citadel-Station-13/upstream-merge-34781
[MIRROR] Fixes omega missing a wheat fridge and runtiming pipenets
2018-01-24 13:51:03 -06:00
CitadelStationBot 00893e2a3e Automatic changelog generation for PR #5050 [ci skip] 2018-01-24 13:50:51 -06:00
LetterJay e32ac3f104 Merge pull request #5050 from Citadel-Station-13/upstream-merge-34787
[MIRROR] Puts beakers in your hand on eject
2018-01-24 13:50:49 -06:00
CitadelStationBot f2aee756e2 Removed named args from visible_message 2018-01-24 11:59:50 -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
CitadelStationBot 2be6577e63 Cleans up duplicated code and GC issues 2018-01-24 11:58:37 -06:00
Leo a7c7e9e8ec Merge pull request #34783 from Cyberboss/FixDumbness
Cleans up duplicated code and GC issues
2018-01-24 11:58:37 -06:00
CitadelStationBot f6dbe1cda5 Corrects invalid process_fire args 2018-01-24 11:56:23 -06:00
Leo 18d193d3ee Merge pull request #34777 from ShizCalev/process-fire
Corrects invalid process_fire args
2018-01-24 11:56:22 -06:00
CitadelStationBot d9feac3c6f Makes the soapstone engravings use examine to show the dialog 2018-01-24 11:49:47 -06:00
Leo 3c72877615 Merge pull request #34826 from DaxDupont/soapstone
Makes the soapstone engravings use examine to show the dialog
2018-01-24 11:49:47 -06:00
CitadelStationBot b58694ca54 Makes photocopier use default_unfasten_wrench 2018-01-24 11:49:39 -06:00
Leo 307465d156 Merge pull request #34819 from ACCount12/unwrenching_standardization
Makes photocopier use default_unfasten_wrench
2018-01-24 11:49:39 -06:00
CitadelStationBot dfc92046dc Buffs the Contributing Guide (Fixes a typo) 2018-01-24 10:06:12 -06:00
Jordan Brown 504815d117 Merge pull request #34825 from Anonmare/patch-3
Buffs the Contributing Guide (Fixes a typo)
2018-01-24 10:06:12 -06:00
CitadelStationBot 35acf9b2a0 Fixes no eye damage being done if damage was exactly 3 2018-01-24 06:13:15 -06:00
Shadowlight213 4a2cd205aa Fixes no eye damage being done if damage was exactly 3 2018-01-24 06:13:14 -06:00
CitadelStationBot e2b4acc537 Fixes emergency lights having null brightness 2018-01-24 06:13:06 -06:00
YPOQ 8c7645fd2b Fixes emergency lights having null brightness (#34796) 2018-01-24 06:13:06 -06:00
CitadelStationBot 0325285510 Abstract landmarks are now indestructible 2018-01-24 06:12:57 -06:00
coiax d7c317b6d0 Abstract landmarks are now indestructible (#34808)
In situations where a maxcap has been dropped above the Bridge, which is
generally the Observer-Start landmark's location, it would destroy the
landmark, making observers get a debugging message asking them to ahelp
when they observed.

There should be a better way of making an object indestructible from any
ingame effect without having to make it QDEL_HINT_LETMELIVE...
2018-01-24 06:12:57 -06:00
CitadelStationBot 307f4e1cb6 Xeno nests are no longer held together by bolts. 2018-01-24 06:12:37 -06:00