a64a1e4a5c
Merge branch 'master' into upstream-merge-33783
2017-12-29 06:49:47 -06:00
518b264654
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33783
...
# Conflicts:
# _maps/map_files/generic/CentCom.dmm
# code/modules/mob/living/living.dm
2017-12-29 01:34:17 -06:00
4157c30fd8
Fixes ethanol + book reaction message ( #33867 )
2017-12-29 00:28:40 -06:00
8a792d6ef6
more save points
2017-12-29 00:07:36 -06:00
0223fed7a3
Merge pull request #33868 from Robustin/EMPruntime
...
Fixes EMP runtime
2017-12-28 04:09:06 -06:00
5dd7136225
Merge branch 'master' into upstream-merge-33590
2017-12-25 21:29:18 -06:00
ac5503d338
Merge branch 'master' into upstream-merge-33055
2017-12-25 04:10:34 -06:00
164db7ae9b
Prefixed all disability defines with DISABILITY_ to fix a name collision
2017-12-24 15:03:30 -06:00
6856fc1be2
[MIRROR] [s] Fixes the frying oil reagent ( #4504 )
...
* Merge pull request #33745 from vuonojenmustaturska/oilfix
[s] Fixes the frying oil reagent
* [s] Fixes the frying oil reagent
2017-12-22 12:32:56 -08:00
bec20087c2
[READY]Clownborgs - ADMIN SPAWN ONLY
2017-12-22 10:58:13 -06:00
b749977eb9
Merge pull request #4476 from Citadel-Station-13/upstream-merge-33697
...
[MIRROR] Fix smoke machine runtime
2017-12-21 04:57:02 -06:00
3973b368de
Merge branch 'master' into upstream-merge-33470
2017-12-21 03:24:03 -06:00
39ecfd64db
Fix smoke machine runtime ( #33697 )
...
* Fix smoke machine runtime
* Woops.
2017-12-21 00:41:09 -06:00
408182758f
Merge branch 'master' into upstream-merge-33498
2017-12-19 17:50:11 -06:00
9e452adcc8
Update holder.dm
2017-12-19 17:16:45 -06:00
522b8383d8
[READY]Refactors reagent container types
2017-12-18 22:54:51 -06:00
3af0aa2489
[Ready Again]Refactors disabilities into lists, allowing for independent disability sources
2017-12-18 15:19:53 -06:00
da25df9329
Makes the chemical smoke machine use stock parts for things
2017-12-18 15:15:33 -06:00
f875d4e176
Defines math, take 2
2017-12-17 10:02:43 -06:00
7af461539f
Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"
2017-12-16 13:08:50 -06:00
253c819bc1
TG Sync 12/15/17
...
s
s
2017-12-15 06:27:57 -08:00
2aef00daf0
All-In-One grinder results are now defined by type, not by huge lists
2017-12-14 15:48:39 -06:00
27c06118cb
Merge pull request #33478 from ACCount12/another_explosion_fix
...
Fixes yet another chem explosion throwing warnings
2017-12-13 14:13:36 -06:00
6846e87ae2
Silver slime extract foods now fry correctly ( #33309 )
...
* Silver slime extract foods now fry correctly
The invocation to create fried food wasn't correct, and was ending up
creating fried food that had the default name and description.
- Also adds a "syringe/plasma" type, because it's annoying having to
spawn in plasma sheets and grind them and then put them into a syringe,
if you want to test slime spawning stuff.
* Contains
2017-12-10 17:42:20 -06:00
7179547be4
Merge branch 'master' into upstream-merge-31727
2017-12-10 21:51:51 +00:00
fd6a386779
Improves the way chem machines handle qdel, fixes some runtimes ( #33415 )
2017-12-10 13:25:21 -06:00
3c9758fe80
Fixes meth explosion throwing warnings ( #33356 )
2017-12-09 01:09:04 -06:00
10d50dd283
Fixes mugs being called "broken bottles"
2017-12-08 10:34:27 -06:00
988dbe87da
Brain Traumas
2017-12-06 12:05:20 -06:00
4a22fed89d
Cleans up goldcore defines
2017-11-26 16:51:44 -06:00
14ce7c8118
Merge pull request #4101 from Citadel-Station-13/upstream-merge-32994
...
[MIRROR] Updates some item drops to use drop_location()
2017-11-25 05:53:16 +00:00
cf053af319
Update pandemic.dm
2017-11-24 18:50:23 -05:00
754490a2d3
Update pandemic.dm
2017-11-24 18:02:51 -05:00
12aa356f10
Updates some item drops to use drop_location()
2017-11-24 12:59:33 -06:00
c43591982a
Refactor on_reagent_change to pass through the change type
2017-11-24 12:59:09 -06:00
b7e99a7448
JSON feedback
2017-11-17 01:44:12 -06:00
286442cf4a
Merge pull request #3833 from Citadel-Station-13/upstream-merge-32183
...
[MIRROR] Ling datum antag standarization.
2017-11-15 15:00:46 -06:00
9849b9a13b
Merge pull request #3912 from Citadel-Station-13/upstream-merge-32482
...
[MIRROR] Improves the deep fryer
2017-11-15 11:13:56 -06:00
1939e96bb6
Merge branch 'master' into upstream-merge-32183
2017-11-15 10:22:40 -06:00
2d137b2bf9
Update medicine_reagents.dm
2017-11-14 15:51:58 -06:00
c3a4d0d06a
Makes cryoxadone heal clone damage again
2017-11-14 05:01:17 -06:00
f610a6110b
Merge pull request #3903 from Citadel-Station-13/upstream-merge-32597
...
[MIRROR] Fixes stimulum decay
2017-11-13 11:45:00 -06:00
9a80e5f91c
Merge pull request #3893 from Citadel-Station-13/upstream-merge-32582
...
[MIRROR] Fixes 512 compile reminders
2017-11-13 11:42:40 -06:00
9dff28b50d
Improves the deep fryer
2017-11-13 03:16:11 -06:00
14944d8711
Merge branch 'master' into upstream-merge-32183
2017-11-12 23:09:55 -06:00
d987dcdda8
Fixes stimulum decay ( #32597 )
...
* Fixes stimulum decay
* Nitryl too
* This too.
* Makes stimulum actually apply it's anti-stun changes.
2017-11-12 15:33:20 -06:00
6286f4d4c2
Merge branch 'master' into upstream-merge-32161
2017-11-11 23:02:13 -06:00
95707bf1b7
fixes 512 compile reminders ( #32582 )
2017-11-11 14:33:22 -06:00
2e0aaf8598
Ling datum antag standarization.
2017-11-05 19:32:59 -06:00
8aef4f3b57
Rename brown gas to nitryl ( #32271 )
2017-11-01 21:37:20 -05:00
LetterJay