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
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
dac6cc56e4
Merge branch 'master' into upstream-merge-30494
2017-09-12 02:40:24 -05:00
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
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
c3a1c08206
Update smartfridge.dm
2017-09-11 17:51:49 -05:00
14aefe2e64
commit
2017-09-11 14:01:42 -05:00
63122795f9
Adds missing span-endings
2017-09-11 07:10:09 -05:00
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
cf07ead653
Regularizes resisting out of containers
2017-09-08 09:58:34 -05:00
3f16272717
line endings ree
2017-08-29 19:57:58 -07:00
6c76ae2395
clean up
2017-08-28 10:34:31 -05:00
defab9c7fc
Merge branch 'master' into upstream-merge-29923
2017-08-28 09:19:44 -05:00
739d5c70a7
Update meat.dm
2017-08-28 09:17:14 -05:00
188193eb61
here we go again ( #2456 )
2017-08-24 19:24:25 -07:00
a6d64204ad
[MIRROR] Updates PubbyStation ( #2325 )
...
no
2017-08-22 18:20:46 -07:00
35b7b93b24
ok this is going to be a pain in the ass ain't it ( #2458 )
...
lets hope nothing blows up this time (Flags PR but it works!)
2017-08-22 05:01:38 -07:00
6a309b5996
Revert "[MIRROR] Replace all secondary flags with bitflags stored in the flags_2 var" ( #2457 )
...
ok you know what yeah i think i'll properly mirror https://github.com/Citadel-Station-13/Citadel-Station-13/pull/2411
2017-08-22 04:04:21 -07:00
b01a24c95b
my eyes hurt
2017-08-22 01:42:20 -05:00
a0cf777040
Merge branch 'master' into upstream-merge-29940
2017-08-21 23:29:24 -05:00
4961966552
|SPECIES FOOD PREFERENCES| ( #2232 )
...
* Species food preferences
* sync
* Update humans.dm
* FUCK PUBBY
2017-08-21 20:23:30 -07:00
41b0f9f9d4
Gorillas
2017-08-20 19:56:21 -05:00
ae9e4495f9
Merge branch 'master' into upstream-merge-29747
2017-08-20 09:53:17 -05:00
f7bde6a76a
Makes mixing meth dangerous again
2017-08-18 18:59:58 -05:00
87b3df3069
Replace all secondary flags with bitflags stored in the flags_2 var
2017-08-17 09:19:14 -05:00
bd35823012
[ready]Makes bIcon better
2017-08-13 17:41:12 -05:00
4d19a89519
Removes a great amount of machinery copypasta with circuitboards.
2017-08-09 19:24:19 -05:00
dd22c79678
Completes major inhand split project ( #2178 )
2017-08-02 06:30:33 -05:00
03e508475f
Merge pull request #2216 from Citadel-Station-13/upstream-merge-29601
...
[MIRROR] Spellchecking
2017-08-01 17:07:56 -05:00
55f1de10a6
Spellchecking
2017-08-01 08:46:20 -05:00
d176fcf24c
Refactors pie throwing and fixes throwing not finalizing in some cases
2017-08-01 07:48:16 -05:00
bbcad2fa58
Proper mirror PR for the disease refactor because I fucked up the first one. ( #2026 )
...
* Revert "im a dumbass and didn't see the .rej files Revert "[MIRROR] Disease Refactor" (#2025 )"
This reverts commit 44742cb115
2017-07-31 23:41:22 -07:00
35fba1933e
Merge pull request #2063 from Citadel-Station-13/upstream-merge-29304
...
[MIRROR] Made some object lists less terrible to read
2017-07-31 03:43:03 -05:00
adc7a52b8d
BYPASSES THE DEEP FREEZE ( #2168 )
2017-07-28 23:51:24 -07:00
2fb28c97c7
Pizza box additions ( #2111 )
2017-07-24 04:06:31 -07:00
85f1b25bcd
Merge pull request #1986 from Citadel-Station-13/upstream-merge-28556
...
[MIRROR] [Seriously, it's ready]Virology Rework: The Thresholdening
2017-07-19 06:29:06 -05:00
a72962c300
Made some object lists less terrible to read
2017-07-18 09:44:43 -05:00
54da14ea6b
Rename Bumped to CollidedWith ( #2017 )
2017-07-15 11:44:12 -07:00
44742cb115
im a dumbass and didn't see the .rej files Revert "[MIRROR] Disease Refactor" ( #2025 )
...
* Revert "Automatic changelog generation for PR #2021 [ci skip]"
This reverts commit 9d0cd37dd3#2021 )"
This reverts commit f2ac487927
2017-07-15 11:41:36 -07:00
f2ac487927
Disease Refactor ( #2021 )
2017-07-15 11:40:49 -07:00
194a6b7aa9
[Seriously, it's ready]Virology Rework: The Thresholdening
2017-07-13 17:46:25 -05:00
ff6bbbedf5
Changes some 1s and 0s to TRUE and FALSE ( #1967 )
2017-07-10 16:13:16 -07:00
1b70c06474
Renames GLOB.cardinal to GLOB.cardinals to match GLOB.diagonals and GLOB.alldirs ( #1970 )
2017-07-10 16:10:42 -07:00
90c2a4f867
Removes now-unnecessary obj_integrity definitions
2017-07-09 19:44:48 -05:00
b1b4826c0c
July 5th TG sync ( #1883 )
...
July 5th TG sync
2017-07-05 22:14:19 -05:00
9d5e51777b
use_power var now uses a define to reflect it not being a bool ( #1842 )
2017-06-30 20:41:59 -07:00
6a38955803
Adds container types INJECTABLE and DRAWABLE
2017-06-27 08:19:49 -05:00
42368581c5
Merge branch 'master' into upstream-merge-26965
2017-06-19 15:39:01 -05:00
f86bda7cda
Adds onions
2017-06-16 16:22:38 -05:00
d9e3699f88
Ports Goonchat
2017-06-08 16:27:56 -05:00
CitadelStationBot