Commit Graph

16414 Commits

Author SHA1 Message Date
Ghommie
7be9305b03 Ports "Makes looping sounds use client time" 2019-07-04 22:50:11 +02:00
Ghommie
5ff8be0faa Ports "Adds safer helper for alt-click turf listing" 2019-07-04 22:42:51 +02:00
Ghommie
b41e289db3 Ports "Fixes default supplypods exploding their contents" & co. 2019-07-04 22:35:13 +02:00
Ghommie
37cf41a3bb Ports "Fixes damp rag not smothering people" 2019-07-04 22:06:16 +02:00
Ghommie
b501edf9cf Ports "fixes spontaneous appendicitis picking incompatible biotypes" 2019-07-04 22:02:20 +02:00
Ghommie
98418c7f87 [s] ports "Fixes infinite brass generation exploit" 2019-07-04 21:54:20 +02:00
Ghommie
f134d58464 Flak. 2019-07-04 21:37:06 +02:00
Ghommie
0361a0a863 Ports "Updates corgi & parrot inventory panels to the same formatting as other mobs"
also "Makes Corgi collars removable"
2019-07-04 21:33:56 +02:00
Ghommie
a2691e8f13 Ports "Add cancel button to assault pod destination selector" 2019-07-04 21:13:03 +02:00
Poojawa
899c5fed7e Oh this should be uncommented too. 2019-07-04 00:56:17 -05:00
Poojawa
43affcb831 properly fixes Quartermaster headrole, mind traits 2019-07-04 00:52:48 -05:00
Poojawa
f66ee6f967 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements 2019-07-04 00:44:29 -05:00
Thalpy
8a6e669060 Merge branch 'master' into master 2019-07-04 03:14:29 +01:00
Ghommie
a3ab5f6d23 Moving the snowflake mob var to the component and finalizing. 2019-07-04 02:03:51 +02:00
Ghommie
8004165599 The big part is done. 2019-07-04 00:30:28 +02:00
Sishen
e5cd1bd7c2 Update thermomachine.dm 2019-07-03 17:46:05 -04:00
Sishen
4fa244e8e4 Update thermomachine.dm 2019-07-03 17:41:27 -04:00
Sishen
9e514bfab5 Update thermomachine.dm 2019-07-03 17:39:41 -04:00
Sishen
df75f9f289 Update thermomachine.dm 2019-07-03 17:38:19 -04:00
Ghommie
44dcfcf55f fml 2019-07-03 23:23:08 +02:00
Sishen
a9f5b99510 Update thermomachine.dm 2019-07-03 16:55:14 -04:00
Ghommie
5799ff402f Progress. 2019-07-03 22:51:10 +02:00
kevinz000
ba74189192 Merge pull request #8768 from Ghommie/Ghommie-cit94
New sprites for the some pda cartridges.
2019-07-03 13:47:53 -07:00
kevinz000
ce2914ab90 Merge pull request #8769 from Arturlang/ALT_Mech_Strafing
Alt now tempoarily disables strafing for mechs.
2019-07-03 13:47:29 -07:00
kevinz000
bce4ce31ab Merge pull request #8778 from Ghommie/Ghommie-cit97
Porting in 18 new drinks from the TGstation, plus tweaking and fixes.
2019-07-03 13:47:04 -07:00
kevinz000
75f1dca544 Merge pull request #8773 from Sishen1542/podgang
Podweak now have all customization options.
2019-07-03 13:46:08 -07:00
kevinz000
e62213a6cd Merge pull request #8775 from Ghommie/Ghommie-cit95
crew monitor indexing pet peeve.
2019-07-03 13:45:34 -07:00
kevinz000
10a584c71f Merge pull request #8776 from Ghommie/Ghommie-cit96
Porting in donut fixes, beepsky smash and Neurotoxin reworks.
2019-07-03 13:45:02 -07:00
kevinz000
d78bd7399b Merge pull request #8798 from Sishen1542/action-button-swaps
Action button swapping
2019-07-03 13:44:34 -07:00
kevinz000
78357018d6 Merge pull request #8783 from Ghommie/Ghommie-cit98
Fixing some emergency pod storage refactor fuck ups.
2019-07-03 13:42:49 -07:00
kevinz000
ab217e81e6 Merge pull request #8781 from Sishen1542/plasteel
Adds plasteel to medical and security techfabs.
2019-07-03 13:42:22 -07:00
Ghommie
adbf67b052 Purging old code,
forcing mind transfer on transform procs,
Fixing a slight fuck up null.ckey 👀
2019-07-03 20:01:49 +02:00
kevinz000
9654308a94 Merge pull request #8809 from Ghommie/Ghommie-cit103
Quickfixing latejoin ghost roles, I'm sorry.
2019-07-03 09:52:14 -07:00
kevinz000
948bba1274 Merge pull request #8799 from Trilbyspaceclone/Cargo_lewds
Adds Promiscuous Organs crate to cargo
2019-07-03 09:51:47 -07:00
kevinz000
e08002ba4f Merge remote-tracking branch 'origin/master' into kevinz000-patch-2 2019-07-03 09:49:23 -07:00
kevinz000
0f0d5323a3 Merge pull request #8797 from Sishen1542/rotate-emitters
Emitters can be rotated instead of only flipped
2019-07-03 05:20:37 -07:00
kevinz000
85534fa1ef Merge pull request #8793 from Ghommie/Ghommie-cit99
Fixes PDA skin preference not saving up.
2019-07-03 05:19:13 -07:00
kevinz000
06f1eb6dcd Merge pull request #8810 from Trilbyspaceclone/patch-185
Corrects  Plastitanium total object damage
2019-07-03 05:18:21 -07:00
kevinz000
8a4d7afca2 Update lungs.dm 2019-07-03 03:55:27 -07:00
Ghommie
1fd50cc15a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit96 2019-07-03 04:52:57 +02:00
Ghommie
ffecca8c11 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28 2019-07-03 03:24:28 +02:00
Ghommie
b2c5e002ec Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit94 2019-07-03 02:50:49 +02:00
Ghommie
c58efa64c1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45 2019-07-03 02:36:23 +02:00
Fermi
5f72277549 Succumb tweak. Ready to merge. 2019-07-02 23:24:35 +01:00
Fermi
381e12f04a Fixing message_admins. 2019-07-02 22:52:45 +01:00
Fermi
27aad8f117 Quick in case. 2019-07-02 22:42:07 +01:00
Sishen
05a55bcb30 Update clock_cult.dm 2019-07-02 17:24:46 -04:00
Fermi
946fbff999 +Yamerol, tweaked PE, tweaked CM3000, tweaked medpH. 2019-07-02 22:15:32 +01:00
Fermi
d83fe49556 +lewdchem pref on CC -EnthrallExpo from botany, tweaks messages on EExpo 2019-07-02 15:03:19 +01:00
Sishen
67a602fd79 hugboxed surgery, works for borgs 2019-07-02 06:26:07 -04:00