36a07f134b
Merge pull request #9208 from Ghommie/Ghommie-cit190
...
Socks uncolorability fix.
2019-08-29 19:28:01 -05:00
2f7402f591
Merge pull request #9184 from Ghommie/Ghommie-cit188
...
Removes an obnoxious temporary overlay var.
2019-08-29 18:19:44 -05:00
0ffeb704af
Socks color fix.
2019-08-28 05:33:36 +02:00
2ce01b3bda
Removes an obnoxious temporary overlay var.
2019-08-23 19:57:57 +02:00
e6dbaf8473
this should work
2019-08-22 13:02:01 -04:00
25a7d3af51
Merge pull request #8968 from Trilbyspaceclone/patch-199
...
Fixes dead/used face huggers from still infecting
2019-08-21 08:16:06 -07:00
a971390cff
Merge pull request #8992 from jakeramsay007/Helmet-Internals
...
[READY] Hardsuit helmets can now be used as internals masks. Rejoice, CE mains.
2019-08-11 10:15:49 -07:00
123b478edd
Merge pull request #8927 from Ghommie/Ghommie-cit151
...
Tones down some items attack stamina costs. kills hypereutactic blades copypasta.
2019-08-11 10:12:20 -07:00
5dcd419d8a
Merge pull request #8356 from Thalpy/master
...
[READY] FermiChem! Adds a new reaction mechanic, 9 new chems and a few extra features to accommodate the new chems.
2019-08-11 16:09:23 +12:00
74008beb8f
Merge pull request #9066 from Ghommie/Ghommie-cit181
...
Two lines fixes for invisible zipties and borked legcuffs.
2019-08-09 22:17:31 -07:00
ee57720ee3
underwear colors fix 2: The revenge of the crunch.
2019-08-09 05:11:12 +02:00
12c4fc139d
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit151
2019-08-09 04:00:23 +02:00
00bca0dd39
raise priority.
2019-08-07 19:20:14 +02:00
ee1b04eefb
Fixes potential "trapped as ghost" problems and examine+scanner text
2019-08-06 19:54:07 +01:00
5795f6bbe2
Merge branch 'master' into master
2019-08-05 09:09:36 +01:00
f1c9a07f6d
Merge pull request #8912 from Ghommie/Ghommie-cit146
...
Ports "Headset Channel Descriptions Are No Longer Hardcoded"
2019-08-04 22:41:49 -07:00
489b4c78dc
Merge pull request #8996 from Ghommie/Ghommie-cit166
...
Adds in worn overlays for different types of cuffs.
2019-08-04 19:19:19 -07:00
5cfb7ef49d
Merge pull request #8999 from BurgerLUA/Xeno-Nerf-part-1-out-of-20
...
Xenomorph larvae no longer gib and inexplicably delete your brain when hatching
2019-08-04 19:18:53 -07:00
8452cf3b8a
Merge pull request #9014 from Ghommie/Ghommie-cit170
...
undergarment fixes.
2019-08-04 19:13:21 -07:00
53a9f3ac51
Merge pull request #9036 from Linzolle/invisiclothes
...
fixes combat gloves plus having no icon, allows for shoes to have their item_state set to use a differently named icon on mobs
2019-08-04 19:09:36 -07:00
27b3cb6656
Merge pull request #9018 from Ghommie/Ghommie-cit171
...
Ports "Bluespace research updates" and "Teleportation standardization, channels, and interception"
2019-08-04 19:04:59 -07:00
d3620c5894
Merge branch 'Helmet-Internals' of https://github.com/jakeramsay007/Citadel-Station-13 into Helmet-Internals
2019-08-04 05:49:10 +01:00
f9d829b111
Proc to define
2019-08-04 05:48:08 +01:00
5e757f1012
Update code/modules/mob/living/carbon/life.dm
...
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com >
2019-08-04 05:26:16 +01:00
0a7054c604
Update code/modules/mob/living/carbon/inventory.dm
...
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com >
2019-08-04 05:26:02 +01:00
46e4023ba9
Monkey business
2019-08-04 05:07:24 +01:00
eca34a6552
Merge pull request #8994 from Ghommie/Ghommie-cit164
...
Makes staminaloss also apply the oxyloss fullscreen overlay.
2019-08-02 01:43:46 -07:00
bc9bca8d04
oh my god
2019-08-02 01:20:32 -05:00
18b03f9053
Furranium fixes.
2019-08-01 03:38:06 +01:00
ec2a3ea778
Ports "Bluespace research updates" and "Teleportation standardization, channels, and interception"
2019-07-31 18:56:00 +02:00
397c62bf7a
undergarment fixes.
2019-07-31 16:19:25 +02:00
fbbc4d8589
Merge branch 'pr/21'
2019-07-29 22:57:40 +01:00
26c195dec8
Merge pull request #8971 from Linzolle/toxiclover
...
makes slimepeople like toxic food
2019-07-29 04:39:12 -07:00
11628431b4
Merge pull request #8976 from Ghommie/Ghommie-cit157
...
Fixes combatmode disarm pushing people on inaccessible tables and more.
2019-07-29 04:38:14 -07:00
cdb45a2ae0
Added
2019-07-28 21:37:49 -07:00
4ef1413342
dupe icons instead of snowflake vars.
2019-07-29 04:50:12 +02:00
2b224400e3
Adds in worn overlays for different types of cuffs.
2019-07-29 04:31:27 +02:00
d080446a77
Merge branch 'pr/20'
2019-07-28 23:28:19 +01:00
6f33856ae7
Makes staminaloss also apply the oxyloss fullscreen overlay.
2019-07-28 18:51:19 +02:00
5055cd73b9
Hardsuit Helmets can now be used as internals masks. Rejoice, CE mains.
...
Also reworks internals code a little to be much more friendly. Any head or mask item with the flag should now function as an internals mask if it has the ALLOWSINTERNALS flag.
2019-07-28 17:31:59 +01:00
4a6982658f
true
2019-07-26 22:04:21 -04:00
1adaf01839
Fixes combatmode disarm pushing people on inaccessible tables and more.
2019-07-26 22:55:46 +02:00
99720f12e5
makes slimepeople like toxic food
2019-07-25 20:55:18 -05:00
1a92134ad3
b
2019-07-25 21:43:02 -04:00
c3e4fa8802
Update facehugger.dm
2019-07-25 13:32:42 -04:00
969aaad3d1
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit151
2019-07-24 17:35:29 +02:00
0f58585e5d
Merge pull request #8939 from Ghommie/Ghommie-cit154
...
Fixing towels and improving them.
2019-07-23 20:34:09 -07:00
1028fe458a
Merge pull request #8909 from Ghommie/Ghommie-cit143
...
Fixes named arg Knockdown calls.
2019-07-22 20:17:30 -07:00
e8584720b3
Fixes suit worn overlay for towels.
2019-07-21 11:18:38 +02:00
15ab1a26a4
Merge branch 'master' into master
2019-07-21 01:50:41 +01:00
nik707