Emmett Gaines
8c11252d93
butterdogs ( #33002 )
2017-11-25 15:35: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
44fb7ccdb7
Update drinkingglass.dm
2017-11-24 18:00:44 -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
ShizCalev
6ab499b57b
Fixes bartender suit having an adjust state
2017-11-22 12:40:32 -06:00
deathride58
0f9a85e4d7
Merge pull request #3747 from Citadel-Station-13/upstream-merge-32101
...
[MIRROR] Refactor of catpeople mutant organs
2017-11-21 21:16:31 +00:00
deathride58
1f6b3ce629
Merge branch 'master' into upstream-merge-32188
2017-11-21 19:53:58 +00:00
deathride58
2abd06e25e
Merge pull request #4028 from Citadel-Station-13/upstream-merge-32862
...
[MIRROR] Rat Kebabs
2017-11-21 04:39:41 +00:00
ShizCalev
831dde525e
Makes drinking glasses smash when thrown
2017-11-20 02:45:22 -06:00
Jordie
f162a48472
Rat Kebabs
2017-11-19 22:49:46 -06:00
Tad Hardesty
3914765c70
Fix runtimes when stacking pizza boxes ( #32831 )
2017-11-18 13:51:01 -06:00
Jordie
b7e99a7448
JSON feedback
2017-11-17 01:44:12 -06:00
LetterJay
668248b987
combines the missed microwave PR
2017-11-15 10:31:41 -06:00
LetterJay
7aea98f749
Update meat.dm
2017-11-14 13:40:58 -06:00
Ashe Higgs
9dff28b50d
Improves the deep fryer
2017-11-13 03:16:11 -06:00
LetterJay
3ea8808201
Merge pull request #3673 from Citadel-Station-13/upstream-merge-32161
...
[MIRROR] 512 forward compatibility merge
2017-11-12 23:06:55 -06:00
LetterJay
94bdcb6848
Merge pull request #3876 from Citadel-Station-13/upstream-merge-32556
...
[MIRROR] Fixed teleporting food out of the deep fryer
2017-11-12 08:20:10 -06:00
LetterJay
6286f4d4c2
Merge branch 'master' into upstream-merge-32161
2017-11-11 23:02:13 -06:00
Jordan Brown
b6e7e8501d
Merge pull request #32556 from Cruix/deep_fryer
...
Fixed teleporting food out of the deep fryer
2017-11-09 23:21:59 -06:00
swindly
3fa561c3b1
fixes spelling and stuff ( #32531 )
2017-11-09 11:04:50 -06:00
vuonojenmustaturska
cc438ea9b4
Refactors and improvements to xenobio slime processor ( #32406 )
...
* Do not let your memes be dreams
* static lists for great justice
* Local man forgets to capitalize a word
* Slime processor no longer runtimes when processing food
2017-11-05 04:32:07 -06:00
ACCount
eb54055278
Refactor of catpeople mutant organs
2017-11-01 21:38:06 -05:00
vuonojenmustaturska
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
Jordan Brown
4b297f509e
512 forward compatibility merge
2017-10-29 10:28:36 -05:00
CitadelStationBot
d25cb1ba5d
[MIRROR] Grammar fixes to atom descriptions ( #3165 )
...
* Grammar fixes to atom descriptions
* compile errors
2017-10-21 07:17:03 -05:00
CitadelStationBot
adc2e46114
[MIRROR] Does some code standardization/consistency. ( #3161 )
...
* Does some code standardization/consistency.
* fixes merge conflict generation
* Missed a few, oops
* Update pierrot_throat.dm
2017-10-21 06:10:22 -05:00
Mercenaryblue
06ea404a28
Prevent creampie overlays from stacking.
2017-10-17 03:48:45 -05:00
Jordan Brown
bd7a0d65b5
Fix many instances of "the the"
2017-10-13 09:41:54 -05:00
Tad Hardesty
01ecdff51a
Improve extended examination text for many objects ( #31381 )
...
Plurality, capitalization, punctuation, and item icons have been
improved. Status displays now show the same text on examination that
they do visually. Inducers only show a success message when they
actually succeed.
2017-10-10 03:07:38 -05:00
XDTM
7a0ce217db
Refactors virus spreading
2017-10-09 08:55:57 -05:00
Jordan Brown
075cb673c0
Remove drop_item, drop_item_v, put_in_hands_or_del
2017-10-07 12:37:06 -05:00
Leo
c873c17478
Merge pull request #31284 from tgstation/Cyberboss-patch-1
...
Code cleanup in snack_meats.dm
2017-10-04 19:27:47 -05:00
ExcessiveUseOfCobblestone
126020185d
Monkey Cubes expanding will give the new monkey an attack log with their creator ( #31236 )
...
* Update snacks_meat.dm
* no one wants to see that
* WE'RE JUST SENDING IT TO ONE PLACE COBBY
* boop
* cool leoz tricks
* Update snacks_meat.dm
2017-10-03 17:56:14 -05:00
oranges
baf72b8412
Merge pull request #31064 from YPOQ/silverfriedfoods
...
Silver slime extracts create proper fried foods
2017-09-28 21:55:42 -05:00
LetterJay
dab03b249d
Merge pull request #2948 from Citadel-Station-13/upstream-merge-30992
...
[MIRROR] Spiderpalooza 1: Foods!
2017-09-26 15:01:02 -04:00
Armhulen
a7d0b50808
Spiderpalooza 1: Foods!
2017-09-26 11:32:36 -05:00
jughu
14fba23c55
Adds two more IMPORANT color burger colors ( #31010 )
...
* Update snacks_burgers.dm
* Update recipes_burger.dm
* Update snacks_burgers.dm
* Update snacks_burgers.dm
2017-09-26 08:52:27 -05:00
CitadelStationBot
1d1badde40
[MIRROR] Fixes chemfridges not displaying items with dots in their name properly ( #2844 )
...
* Fixes chemfridges not displaying items with dots in their name properly
* Fixes chemfridges not displaying items with dots in their name properly
2017-09-17 22:15:22 -05:00
CitadelStationBot
d156fecdbf
[MIRROR] Fixes skinless species dropping human skin when gibbed ( #2735 )
...
* Fixes skinless species dropping human skin when gibbed (#30649 )
* fix gibbing skinless species
* = loc -> forceMove(loc)
* oops
* Fixes skinless species dropping human skin when gibbed
2017-09-14 07:52:03 -05:00
LetterJay
dac6cc56e4
Merge branch 'master' into upstream-merge-30494
2017-09-12 02:40:24 -05:00
LetterJay
b73b6a967a
Merge pull request #2680 from Citadel-Station-13/upstream-merge-30519
...
[MIRROR] In which smartfridge ui_data is called only when needed, and a minor display bug involving drying racks is fixed
2017-09-11 18:44:40 -05:00
LetterJay
6cc0ea6af0
Merge pull request #2659 from Citadel-Station-13/upstream-merge-30412
...
[MIRROR] Regularizes resisting out of containers
2017-09-11 18:05:52 -05:00
LetterJay
c3a1c08206
Update smartfridge.dm
2017-09-11 17:51:49 -05:00
LetterJay
14aefe2e64
commit
2017-09-11 14:01:42 -05:00
kingofkosmos
63122795f9
Adds missing span-endings
2017-09-11 07:10:09 -05:00
oranges
adc85f0edc
In which smartfridge ui_data is called only when needed, and a minor display bug involving drying racks is fixed
2017-09-10 06:00:52 -05:00
kingofkosmos
cf07ead653
Regularizes resisting out of containers
2017-09-08 09:58:34 -05:00
kevinz000
3f16272717
line endings ree
2017-08-29 19:57:58 -07:00
