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
e18457f92e
Merge pull request #4284 from Citadel-Station-13/upstream-merge-33356
...
[MIRROR] Fixes meth explosions throwing warnings
2017-12-10 03:12:19 +00:00
3c9758fe80
Fixes meth explosion throwing warnings ( #33356 )
2017-12-09 01:09:04 -06:00
742d50b5e7
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into donoritemmodularization
...
# Conflicts:
# code/citadel/custom_loadout/custom_items.dm
# code/datums/components/riding.dm
# code/game/objects/items/implants/implantuplink.dm
# icons/mob/neck.dmi
# icons/obj/clothing/cloaks.dmi
2017-12-08 19:58:41 -05: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
f57e02ce95
Merge branch 'master' into donoritemmodularization
2017-12-04 20:17:02 -05:00
1d8618eaca
Merge pull request #4139 from Citadel-Station-13/upstream-merge-33090
...
[MIRROR] Cleans up goldcore defines
2017-11-27 03:11:42 +00:00
4a22fed89d
Cleans up goldcore defines
2017-11-26 16:51:44 -06:00
fb4787fbd1
Oldstation edits/fixes ( #33080 )
2017-11-26 00:01:21 -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
eba36e48f9
Merge pull request #3984 from Citadel-Station-13/upstream-merge-32188
...
[MIRROR] JSON feedback
2017-11-22 18:42:34 -06:00
b6630b41d1
merges #3877 proper
2017-11-22 17:37:22 -05:00
6ab499b57b
Fixes bartender suit having an adjust state
2017-11-22 12:40:32 -06:00
1f6b3ce629
Merge branch 'master' into upstream-merge-32188
2017-11-21 19:53:58 +00:00
831dde525e
Makes drinking glasses smash when thrown
2017-11-20 02:45:22 -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
37085ee10e
Merge pull request #3930 from Citadel-Station-13/upstream-merge-32723
...
[MIRROR] Makes cryoxadone heal clone damage again
2017-11-15 10:40:13 -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
d8847ea167
[READY]integrated circuitry port+upgrade.
2017-11-14 05:00:48 -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
c11dc9d20f
Merge pull request #32560 from Mark9013100/11/9/17_char_antitox
...
Renames charcoal bottles
2017-11-10 09:10:41 -06:00
2e0aaf8598
Ling datum antag standarization.
2017-11-05 19:32:59 -06:00
144df6c549
Fix a few syntactic aberrations ( #32284 )
2017-11-02 04:21:51 -05:00
8aef4f3b57
Rename brown gas to nitryl ( #32271 )
2017-11-01 21:37:20 -05:00
adca482008
Nerfs smoke machine + improves grammar ( #32196 )
...
* https is the way to go
* changes links to https:// instead of http://
* tsk tsk byond
* Nerfs smoke machine + improves grammar
* requested changes
* i can spell
2017-10-31 15:19:08 -05:00
09a198fb65
Merge pull request #3694 from Citadel-Station-13/upstream-merge-32225
...
[MIRROR] Deterministic output slots for smartfridges
2017-10-30 23:32:39 -04:00
5bd7184d9c
Deterministic output slots for smartfridges ( #32225 )
...
* a spooky commit
* It is too late, the skeleton is already inside you
* mexican river dolphins for halloween 2018
* Compiler warnings for halloween 2018
2017-10-30 14:35:26 -05:00
e486038c2e
Fixes filling smoke machines with pills ( #32140 )
...
Fixes #32102
Checks for the OPENCONTAINER flag after seeing if the object being used to fill the smoke machine has reagents in it
2017-10-29 16:01:34 -05:00
4b297f509e
512 forward compatibility merge
2017-10-29 10:28:36 -05:00
f900f2ea9a
Merge pull request #3660 from Citadel-Station-13/upstream-merge-31864
...
[MIRROR] Makes thermite a component
2017-10-29 04:23:16 -04:00
13891ec34b
Merge pull request #3651 from Citadel-Station-13/upstream-merge-32107
...
[MIRROR] Adds some new grindables to the grinder
2017-10-29 03:46:19 -04:00
74a33169cb
Merge pull request #3642 from Citadel-Station-13/upstream-merge-32051
...
[MIRROR] More radiation balance changes and fixes
2017-10-29 02:41:44 -04:00
c64446962d
Merge branch 'master' into upstream-merge-32096
2017-10-28 03:47:08 -04:00
coiax