Commit Graph

11903 Commits

Author SHA1 Message Date
CitadelStationBot 107c890e77 Adds a new bar sign - The Lightbulb 2018-01-15 15:06:29 -06:00
Ashe Higgs 9a5b1da92c Adds the Lightbulb bar sign (#34480) 2018-01-15 15:06:28 -06:00
CitadelStationBot 2c337dac81 Automatic changelog generation for PR #4845 [ci skip] 2018-01-15 09:40:47 -06:00
deathride58 30af76a0a2 Merge pull request #4845 from Citadel-Station-13/upstream-merge-34325
[MIRROR]  Makes the lavaland mining base have more correct baseturfs
2018-01-15 15:40:45 +00:00
CitadelStationBot 72cc816253 Automatic changelog generation for PR #4844 [ci skip] 2018-01-15 09:40:25 -06:00
deathride58 f595c71b8f Merge pull request #4844 from Citadel-Station-13/upstream-merge-34354
[MIRROR] Xenomorph maids (and Barmaids) clean on move
2018-01-15 15:40:23 +00:00
CitadelStationBot 6095acc300 Automatic changelog generation for PR #4843 [ci skip] 2018-01-15 09:39:34 -06:00
deathride58 bd90207710 Merge pull request #4843 from Citadel-Station-13/upstream-merge-34309
[MIRROR] Remakes the space syndicate listening post.
2018-01-15 15:39:32 +00:00
CitadelStationBot 50be4bae07 Automatic changelog generation for PR #4842 [ci skip] 2018-01-15 09:39:07 -06:00
deathride58 aea0bb0394 Merge pull request #4842 from Citadel-Station-13/upstream-merge-34371
[MIRROR] Fixes missing pipe colors in RPD and pipe painter
2018-01-15 15:39:04 +00:00
CitadelStationBot ef18182971 Automatic changelog generation for PR #4841 [ci skip] 2018-01-15 09:38:37 -06:00
deathride58 ffb48b7452 Merge pull request #4841 from Citadel-Station-13/upstream-merge-34349
[MIRROR] Fix MMIs in mechs and firesuits being burned by ash storms
2018-01-15 15:38:35 +00:00
deathride58 e866c71933 Merge pull request #4840 from Citadel-Station-13/upstream-merge-34326
[MIRROR] Various deadchat messages are more informative and consistent
2018-01-15 15:38:15 +00:00
CitadelStationBot bc350e3429 Makes the lavaland mining base have more correct baseturfs 2018-01-15 08:43:08 -06:00
Emmett Gaines a2bc36a791 makes the lavaland mining base have more correct baseturfs (#34325) 2018-01-15 08:43:08 -06:00
CitadelStationBot f5cb666bb0 Xenomorph maids (and Barmaids) clean on move 2018-01-15 08:01:18 -06:00
coiax c3d0e7d2b5 Xenomorph maids (and Barmaids) clean on move (#34354)
🆑 coiax
add: A xenomorph maid (or barmaid) cleans the floor as they walk on it.
Lie down, and they'll clean your face.
/🆑

- Clearly a massive xenobiology buff by letting them create simple mob
janitors.
- Actually implemented so the Barmaid can clean up the Emergency Escape
Bar, but sure, let's buff the regular maid as well.
2018-01-15 08:01:18 -06:00
CitadelStationBot d840dc2b73 Remakes the space syndicate listening post. 2018-01-15 07:18:15 -06:00
WJohn 16596405e1 Remakes the space syndicate listening post. (#34309)
* Remakes the space syndicate listening post. TGM in a second.

* TGM of the map

* Removes space suit from EVA.

* Removes bed and dirty var.
2018-01-15 07:18:15 -06:00
CitadelStationBot 9ce55f500d Fixes missing pipe colors in RPD and pipe painter 2018-01-15 03:01:36 -06:00
ShizCalev 8f1a21b2be Fixes missing pipe colors in RPD and pipe painter (#34371) 2018-01-15 03:01:36 -06:00
CitadelStationBot b8fe4756e2 Fix MMIs in mechs and firesuits being burned by ash storms 2018-01-15 02:58:24 -06:00
Tad Hardesty aa774aeaea Fix MMIs in mechs and firesuits being burned by ash storms (#34349) 2018-01-15 02:58:24 -06:00
CitadelStationBot c3ce918b41 Various deadchat messages are more informative and consistent 2018-01-15 02:56:10 -06:00
coiax 497e6bb13f Various deadchat messages are more informative and consistent (#34326)
More deadchat messages now follow the following format.

> George Mellons has done a thing at AreaName.

- Shuttle calling
- Shuttle recalling
- Security level changing
- Maintenance accessing
- Swiping for red,emergency maint, bsa
- Messenging centcom, syndicate

Fixes #34230.
Fixes #34231.
2018-01-15 02:56:10 -06:00
CitadelStationBot a7b75651f9 Automatic changelog generation for PR #4829 [ci skip] 2018-01-15 00:19:02 -06:00
deathride58 c63028e8bc Merge pull request #4829 from Citadel-Station-13/upstream-merge-34384
[MIRROR] Quality of life: Newly constructed APCS are unlocked
2018-01-15 06:18:59 +00:00
deathride58 14ae9ace64 Merge pull request #4831 from Citadel-Station-13/upstream-merge-34374
[MIRROR] Rocket Pods now require manual disassembly
2018-01-15 06:18:29 +00:00
CitadelStationBot 63660230cc Automatic changelog generation for PR #4837 [ci skip] 2018-01-15 00:18:12 -06:00
deathride58 741dba1a9f Merge pull request #4837 from Citadel-Station-13/upstream-merge-34373
[MIRROR] The Express Console emag effect is now a proper emag effect
2018-01-15 06:18:10 +00:00
CitadelStationBot 9322438870 Automatic changelog generation for PR #4836 [ci skip] 2018-01-15 00:17:53 -06:00
deathride58 2b859638e9 Merge pull request #4836 from Citadel-Station-13/upstream-merge-34396
[MIRROR] Fixed alt-click not working with stacks
2018-01-15 06:17:51 +00:00
CitadelStationBot 0c79992b49 Automatic changelog generation for PR #4835 [ci skip] 2018-01-15 00:17:32 -06:00
deathride58 f7a47b226c Merge pull request #4835 from Citadel-Station-13/upstream-merge-34416
[MIRROR] Use space heaters for their designed purpose
2018-01-15 06:17:30 +00:00
CitadelStationBot e16261f245 Automatic changelog generation for PR #4834 [ci skip] 2018-01-15 00:17:08 -06:00
deathride58 d61069dc84 Merge pull request #4834 from Citadel-Station-13/upstream-merge-34409
[MIRROR] Fixes monkeymode shit
2018-01-15 06:17:06 +00:00
deathride58 b0e036a7fd Merge pull request #4833 from Citadel-Station-13/upstream-merge-34417
[MIRROR] Removes SS_KEEP_TIMING from SSprojectiles
2018-01-15 06:16:42 +00:00
deathride58 a886b53253 Merge pull request #4832 from Citadel-Station-13/upstream-merge-34395
[MIRROR] fixes for mouse race
2018-01-15 06:16:17 +00:00
CitadelStationBot cad097c093 Automatic changelog generation for PR #4830 [ci skip] 2018-01-15 00:16:02 -06:00
deathride58 7aa16095cd Merge pull request #4830 from Citadel-Station-13/upstream-merge-34372
[MIRROR] Fixes players not being immune to their own slime timestops
2018-01-15 06:16:00 +00:00
CitadelStationBot a2b037c319 The Express Console emag effect is now a proper emag effect 2018-01-14 23:48:55 -06:00
Iamgoofball dcd61e0ba4 The Express Console emag effect is now a proper emag effect (#34373)
* The Express Console emag effect is now a proper emag effect

cyka blyat

* Update expressconsole.dm

* Update expressconsole.dm

* Update expressconsole.dm

* Update expressconsole.dm

* Update expressconsole.dm

* Update expressconsole.dm

* Update expressconsole.dm

* Update expressconsole.dm
2018-01-14 23:48:55 -06:00
CitadelStationBot 8bad0f2334 Fixed alt-click not working with stacks 2018-01-14 22:05:07 -06:00
John Ginnane ac1b2f76ef Fixed alt-click not working with stacks (#34396)
* Can disable auto-merge

New argument which lets you stop stacks from automatically merging when picking them up

* Fix 0 stacks

* Updated simple_animal/put_in_hands()
2018-01-14 22:05:07 -06:00
CitadelStationBot 4a985886e0 Use space heaters for their designed purpose 2018-01-14 22:03:57 -06:00
F-OS af1d40ca52 Tweaks spaceheater description (#34416)
* Update spaceheater.dm

* Update spaceheater.dm

* Update spaceheater.dm

* Update spaceheater.dm

* Update spaceheater.dm

* Update spaceheater.dm

* Allah my loving lord and savior grant me mercy
2018-01-14 22:03:57 -06:00
CitadelStationBot 053d5ec642 Fixes monkeymode shit 2018-01-14 22:02:47 -06:00
Jordan Brown 29a3a196b4 Merge pull request #34409 from MoreRobustThanYou/patch-45
Fixes monkeymode shit
2018-01-14 22:02:47 -06:00
CitadelStationBot 2354e2876a Removes SS_KEEP_TIMING from SSprojectiles 2018-01-14 22:02:41 -06:00
Jordan Brown 29f0dc8006 Merge pull request #34417 from kevinz000/patch-431
Removes SS_KEEP_TIMING from SSprojectiles
2018-01-14 22:02:40 -06:00