LetterJay
ac5503d338
Merge branch 'master' into upstream-merge-33055
2017-12-25 04:10:34 -06:00
CitadelStationBot
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
LetterJay
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
LetterJay
3973b368de
Merge branch 'master' into upstream-merge-33470
2017-12-21 03:24:03 -06:00
MoreRobustThanYou
39ecfd64db
Fix smoke machine runtime ( #33697 )
...
* Fix smoke machine runtime
* Woops.
2017-12-21 00:41:09 -06:00
LetterJay
408182758f
Merge branch 'master' into upstream-merge-33498
2017-12-19 17:50:11 -06:00
LetterJay
349b0f4f20
Update spray.dm
2017-12-19 17:19:05 -06:00
LetterJay
fdfdaa230a
Update glass.dm
2017-12-19 17:18:27 -06:00
LetterJay
39b016306c
Update reagent_containers.dm
2017-12-19 17:17:54 -06:00
LetterJay
9e452adcc8
Update holder.dm
2017-12-19 17:16:45 -06:00
LetterJay
1b9d60c604
Update reagent_containers.dm
2017-12-19 15:29:55 -06:00
ACCount
522b8383d8
[READY]Refactors reagent container types
2017-12-18 22:54:51 -06:00
XDTM
3af0aa2489
[Ready Again]Refactors disabilities into lists, allowing for independent disability sources
2017-12-18 15:19:53 -06:00
nicbn
da25df9329
Makes the chemical smoke machine use stock parts for things
2017-12-18 15:15:33 -06:00
LetterJay
3c5632bad2
Update pill.dm
2017-12-17 17:38:51 -06:00
Emmett Gaines
f875d4e176
Defines math, take 2
2017-12-17 10:02:43 -06:00
LetterJay
7af461539f
Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"
2017-12-16 13:08:50 -06:00
kevinz000
253c819bc1
TG Sync 12/15/17
...
s
s
2017-12-15 06:27:57 -08:00
Ashe Higgs
2aef00daf0
All-In-One grinder results are now defined by type, not by huge lists
2017-12-14 15:48:39 -06:00
Leo
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
CitadelStationBot
cc0b768c72
[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES ( #4014 )
...
* [READY] RND TECHWEBS + DEPARTMENTAL LATHES
* resetting all the maps because we can worry about them later.
* Regexing
* I'm fucked
* Fixes
* .
* maps
* bleh
* ree
* fixes
2017-12-11 16:36:38 -08:00
coiax
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
deathride58
7179547be4
Merge branch 'master' into upstream-merge-31727
2017-12-10 21:51:51 +00:00
ACCount
fd6a386779
Improves the way chem machines handle qdel, fixes some runtimes ( #33415 )
2017-12-10 13:25:21 -06:00
deathride58
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
ACCount
3c9758fe80
Fixes meth explosion throwing warnings ( #33356 )
2017-12-09 01:09:04 -06:00
deathride58
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
oranges
10d50dd283
Fixes mugs being called "broken bottles"
2017-12-08 10:34:27 -06:00
XDTM
988dbe87da
Brain Traumas
2017-12-06 12:05:20 -06:00
deathride58
f57e02ce95
Merge branch 'master' into donoritemmodularization
2017-12-04 20:17:02 -05:00
deathride58
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
ShizCalev
4a22fed89d
Cleans up goldcore defines
2017-11-26 16:51:44 -06:00
Mark9013100
fb4787fbd1
Oldstation edits/fixes ( #33080 )
2017-11-26 00:01:21 -06:00
deathride58
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
deathride58
cf053af319
Update pandemic.dm
2017-11-24 18:50:23 -05:00
deathride58
754490a2d3
Update pandemic.dm
2017-11-24 18:02:51 -05:00
ShizCalev
12aa356f10
Updates some item drops to use drop_location()
2017-11-24 12:59:33 -06:00
oranges
c43591982a
Refactor on_reagent_change to pass through the change type
2017-11-24 12:59:09 -06:00
LetterJay
eba36e48f9
Merge pull request #3984 from Citadel-Station-13/upstream-merge-32188
...
[MIRROR] JSON feedback
2017-11-22 18:42:34 -06:00
deathride58
b6630b41d1
merges #3877 proper
2017-11-22 17:37:22 -05:00
ShizCalev
6ab499b57b
Fixes bartender suit having an adjust state
2017-11-22 12:40:32 -06:00
deathride58
1f6b3ce629
Merge branch 'master' into upstream-merge-32188
2017-11-21 19:53:58 +00:00
ShizCalev
831dde525e
Makes drinking glasses smash when thrown
2017-11-20 02:45:22 -06:00
Jordie
b7e99a7448
JSON feedback
2017-11-17 01:44:12 -06:00
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
1939e96bb6
Merge branch 'master' into upstream-merge-32183
2017-11-15 10:22:40 -06:00
LetterJay
2d137b2bf9
Update medicine_reagents.dm
2017-11-14 15:51:58 -06:00
Jordan Brown
c3a4d0d06a
Makes cryoxadone heal clone damage again
2017-11-14 05:01:17 -06:00
