Commit Graph

7859 Commits

Author SHA1 Message Date
Ashe Higgs
9a5b1da92c Adds the Lightbulb bar sign (#34480) 2018-01-15 15:06:28 -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
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
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
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
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
Emmett Gaines
a2bc36a791 makes the lavaland mining base have more correct baseturfs (#34325) 2018-01-15 08:43:08 -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
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
ShizCalev
8f1a21b2be Fixes missing pipe colors in RPD and pipe painter (#34371) 2018-01-15 03:01:36 -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
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
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
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
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
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
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
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
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
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
Jordan Brown
29a3a196b4 Merge pull request #34409 from MoreRobustThanYou/patch-45
Fixes monkeymode shit
2018-01-14 22:02:47 -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
Tlaltecuhtli
37fa7830ec Fixes eating mouse grammar (#34395) 2018-01-14 22:01:31 -06:00
Iamgoofball
a5a1838bcb Rocket Pods now require manual disassembly (#34374)
Bluespacing out simply wasn't metal enough tbh
2018-01-14 21:59:20 -06:00
Leo
4b56baf1a6 Merge pull request #34372 from YPOQ/slimestopfix
Fixes players not being immune to their own slime timestops
2018-01-14 21:35:50 -06:00
Leo
2b4735ded0 Merge pull request #34384 from F-OS/patch-3
Quality of life: Newly constructed APCS are unlocked
2018-01-14 21:32:38 -06:00
deathride58
071235d790 Update uplink.dm 2018-01-14 18:01:56 -05:00
oranges
ef200d44c5 Added tooltips to roundend traitor purchase logs 2018-01-14 16:43:11 -06:00
Tlaltecuhtli
ac14a5b4e8 sfds (#34392) 2018-01-14 15:42:06 -06:00
deathride58
c3ce0d8f28 Merge pull request #4821 from Citadel-Station-13/wagfix2018
Fixes *wag for mammals
2018-01-14 21:12:01 +00:00
deathride58
6162d812f4 Merge pull request #4825 from Citadel-Station-13/upstream-merge-34123
[MIRROR] Moves GLOB.movement_keys into SSinput and adds movement direction badminry
2018-01-14 20:42:40 +00:00
deathride58
96ffb89fc1 Merge pull request #4823 from Citadel-Station-13/message-visibility
Fixes message visibility for vorish play
2018-01-14 20:42:13 +00:00
Emmett Gaines
e27346812f Moves GLOB.movement_keys into SSinput and adds movement direction badminry (#34123)
* badmin flip dirs

* moves movement_keys into SSinput from GLOB
2018-01-14 13:39:01 -06:00
Poojawa
e385ab090e Fixes message visibility for vorish play
It's the little things I have to prune.
2018-01-14 12:01:24 -06:00
Poojawa
7498bae414 Re-adds AK-47s button
ستالين هو أعظم

You're welcome.
2018-01-14 04:18:17 -06:00
Poojawa
655067471a Fixes *wag for mammals
Someone forgot that we have snowflake bodyparts.
2018-01-14 03:50:26 -06:00
LetterJay
703275c86f Merge pull request #4803 from Citadel-Station-13/upstream-merge-34276
[MIRROR] Update TGS API to 3.2.0.2
2018-01-14 03:12:31 -06:00
Jordan Brown
f7d70d1454 Merge pull request #34407 from optimumtact/anturredtextsmyevent
Make traitor panel clearer when toggling completion state
2018-01-13 23:21:46 -06:00
deathride58
9332db5bb0 Fixes character slot changing runtiming 2018-01-13 23:08:50 -05:00
deathride58
87b614aaf9 Merge pull request #4817 from Citadel-Station-13/upstream-merge-34338
[MIRROR] Replaces cached get_area vars to grab area names with get_area_name()
2018-01-14 04:01:33 +00:00
deathride58
ef29d783e9 Merge pull request #4816 from Citadel-Station-13/upstream-merge-34328
[MIRROR] Updates TIMER_UNIQUE documentation
2018-01-14 04:01:15 +00:00
deathride58
1cbc4596d3 Merge pull request #4814 from Citadel-Station-13/upstream-merge-34376
[MIRROR] Fixes mecha pilot speed.
2018-01-14 04:00:39 +00:00
ShizCalev
80095fea0a Replaces cached get_area vars for names (#34338) 2018-01-13 20:56:11 -06:00
Jordan Brown
effea9f679 Updates TIMER_UNIQUE documentation (#34328) 2018-01-13 17:23:47 -06:00
AnturK
50529187d6 Fixes mecha pilot speed. 2018-01-13 14:51:10 -06:00
AnturK
269cbab223 Fixes cables/lattices for lateloaded templates. 2018-01-13 14:51:03 -06:00
deathride58
bfd2f6cd24 Merge pull request #4812 from Citadel-Station-13/upstream-merge-34362
[MIRROR] Code fix for stat_entry on NO_FIRE subsystems
2018-01-13 20:29:26 +00:00