Commit Graph

9278 Commits

Author SHA1 Message Date
Ghommie
f97a4b3a78 changes. 2019-06-22 19:50:56 +02:00
Linzolle
846f6789da suggested changes 2019-06-22 11:05:34 -05:00
Ghommie
d50afb9275 frickkkkeroni pepperoni garlic. 2019-06-22 17:58:42 +02:00
Ghommie
45109776e1 Ports in "Liver removal/failure now also stops passive reagent effects" 2019-06-22 17:05:08 +02:00
Ghommie
b85d4d6fb3 Sort of porting MRE rations from Yogstation. 2019-06-22 16:05:03 +02:00
Fermi
1f5a7c0a25 Added velvet styling 2019-06-22 13:31:55 +01:00
Fermi
226dbe7804 Fixed blank sprite for velvet chord organ 2019-06-22 13:09:18 +01:00
Fermi
d2685be3f6 Split custom echo code into it's own call to reduce overhead. 2019-06-22 12:18:38 +01:00
Sishen
94b8b33efa Update medicine_reagents.dm 2019-06-22 00:41:52 -04:00
Linzolle
6709483aec allows quick maxing of suit sensors 2019-06-21 23:06:53 -05:00
Thalpy
498c35b733 Fixes empathy antag check exploit. (#8690)
* Fixes exploit

* Wrong way round..!

* Should be okay for antags now.

* Fixed githuba being dumb
2019-06-21 19:33:34 -07:00
Sishen
0a43036eae hugboxing slimepeople one thing at a time 2019-06-21 20:01:19 -04:00
Arturlang
8be06ddcd0 Fixes 2019-06-21 17:27:57 +03:00
TrilbySpaseClone
771ac9724e ports Fel connet
Shamelessly stealing content
2019-06-21 04:39:10 -04:00
Trilbyspaceclone
2945ae2a39 Update uplink_items.dm 2019-06-21 03:50:12 -04:00
Sishen
ec43b34995 access denied 2019-06-20 20:56:25 -04:00
Sishen
59cf148211 Update large_objects.dm 2019-06-20 20:09:44 -04:00
Sishen
a5f1028cd8 Update packs.dm 2019-06-20 19:47:45 -04:00
Sishen
df7f8b8313 Update large_objects.dm 2019-06-20 19:23:47 -04:00
Sishen
0d3efa0abd sell gases to get that fuckin bike 2019-06-20 19:21:12 -04:00
kevinz000
adfe8373f9 Update admin_investigate.dm 2019-06-20 14:18:29 -07:00
Fermi
88ec4e336e Small oops. 2019-06-20 03:34:49 +01:00
Fermi
35cc690f91 One more sneaky multiplier! 2019-06-20 02:16:53 +01:00
Thalpy
3f10ad390b Update code/modules/mob/living/simple_animal/friendly/panda.dm
Wah

Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>
2019-06-20 02:15:55 +01:00
Fermi
b51f902c14 I can't spell 2019-06-20 02:13:36 +01:00
Fermi
1cefd6fca7 Added a few more comments for reviewers as I was reviewing myself. 2019-06-19 23:04:08 +01:00
Sishen
3fee680f39 rename flag is for pen, my mistake 2019-06-19 16:09:03 -04:00
Fermi
713d849c03 Merge remote-tracking branch 'upstream/master' 2019-06-19 21:02:30 +01:00
Sishen
3211a199af trenchcloak 2019-06-19 15:57:47 -04:00
Ghommie
8a302552f2 Ouch really. 2019-06-19 06:22:19 +02:00
Ghommie
98367a8b00 more. 2019-06-19 04:44:59 +02:00
Ghommie
8764d781a3 Porting smartfridge improvements. 2019-06-19 04:28:36 +02:00
Ghommie
2d13a9f289 clothes burning only spam You of Your clothes 2019-06-19 03:41:48 +02:00
Ghommie
55795355fd Ports "[s] Fixes pride mirror exploit" 2019-06-19 03:31:36 +02:00
Fermi
e0cada7965 Quick fix for a runtime 2019-06-19 01:08:23 +01:00
Fermi
fec1df2098 Rephrasal for understanding. 2019-06-19 00:52:45 +01:00
Ghommie
db3d5848c2 Ports in beekini and bee socks. 2019-06-19 01:28:47 +02:00
Fermi
724ec93166 oops 2019-06-19 00:24:02 +01:00
Fermi
f5c98f5d57 Merge branch 'Dwarf' of https://github.com/Thalpy/Citadel-Station-13 into Dwarf 2019-06-19 00:17:30 +01:00
Fermi
fe6296b58a Added crafting recipies as per Bhijin's request. 2019-06-19 00:17:18 +01:00
Fermi
699b78dd80 Red pandas! 2019-06-18 23:00:54 +01:00
Fermi
38ed75dc68 Reverts sneaky pandas 2019-06-18 22:48:34 +01:00
Ghommie
75a6068a86 Ports "Fixes advanced proc calls not working + various code cleaning" 2019-06-18 22:51:48 +02:00
Fermi
ade3a4bced Fixes. 2019-06-18 19:06:26 +01:00
Fermi
d2a5e9ddfd Makeup panda 2019-06-18 18:51:30 +01:00
kevinz000
634f11d60d Update human.dm 2019-06-18 02:34:05 -07:00
kevinz000
8061be14c8 Update chat_commands.dm 2019-06-17 22:50:12 -07:00
kevinz000
b48d0ff802 Update chat_commands.dm 2019-06-17 22:43:49 -07:00
Ghommie
4797a306cc applying suggestions. 2019-06-17 22:04:34 +02:00
Trilbyspaceclone
4e1ac41393 Update species.dm 2019-06-17 14:41:06 -04:00