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
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
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
c657244d9b
Merge pull request #8920 from Ghommie/Ghommie-cit149
...
Towels.
2019-07-20 12:06:54 -07:00
4e6554076c
item flags, not clothing flags.
2019-07-18 00:16:14 +02:00
589cdae0e1
Towels
2019-07-18 00:03:49 +02:00
b6f10c96a7
Modularity was a mistake.
2019-07-16 21:05:12 +02:00
bb81a0850b
Merge branch 'master' into batch-check-injuries
...
# Conflicts:
# code/modules/mob/living/carbon/human/human_defense.dm
2019-07-14 20:49:52 -04:00
3504f15c01
Travis Bump
2019-07-14 20:29:23 -04:00
628244c0ba
Merge pull request #8869 from Ghommie/Ghommie-cit129
...
Ports "Show codewords on round end screen"
2019-07-14 14:49:11 -07:00
2ec5d3f02e
Merge pull request #8886 from Ghommie/Ghommie-cit137
...
Ports "Refactors NODROP flag into TRAIT_NODROP"
2019-07-14 14:05:20 -07:00
b153294a24
Merge pull request #8857 from Ghommie/Ghoomie-cit127
...
Refactoring underwear to allow custom color preferences.
2019-07-14 03:38:45 -07:00
129ca9d71f
Ports "Refactors NODROP flag into TRAIT_NODROP"
2019-07-13 10:27:39 +02:00
1eaddd3ebf
Merge pull request #8853 from Ghommie/Ghommie-cit125
...
Ports "Cleans up saycode by removing random hook stubs and using a signal where relevant"
2019-07-12 07:34:19 -07:00
bef0027287
In a haste, we forget thousand things.
2019-07-11 08:50:47 +02:00
143410c176
Blame Poojawa for the issue.
2019-07-11 07:39:29 +02:00
ba7c24a0ec
Refactoring underwear to allow custom color preferences.
2019-07-09 23:25:54 +02:00
490ae9daf2
Ports "Cleans up saycode by removing random hook stubs and using a signal where relevant"
2019-07-09 07:58:22 +02:00
e56fc559ed
Merge pull request #8748 from Citadel-Station-13/kevinz000-patch-15
...
Raises corpse miasma generation by 5x. Lowers miasma disease chance per mole by 10x. Miasma now does absolutely nothing unless there's enough of it in the air to actually flow into scrubbers so there's no invisible pockets of disease stuck everywhere.
2019-07-08 18:15:20 -04:00
42cee552fe
Merge pull request #8709 from Trilbyspaceclone/Fel_port_1
...
Ports "Fixes every issue in the slimes milestone. #44450 "
2019-07-08 18:10:46 -04:00
748550895d
Merge pull request #8632 from Arturlang/Traitor_Codeword_Highlight
...
Ports traitor codeword highlighting
2019-07-05 06:57:49 -07:00
bce4ce31ab
Merge pull request #8778 from Ghommie/Ghommie-cit97
...
Porting in 18 new drinks from the TGstation, plus tweaking and fixes.
2019-07-03 13:47:04 -07:00
75f1dca544
Merge pull request #8773 from Sishen1542/podgang
...
Podweak now have all customization options.
2019-07-03 13:46:08 -07:00
4b83110db7
fuck copypasta; Fixes master not compiling. Stop blindly copy-pasting shit from other codebases without even so much as making sure it compiles. Holy fuck.
2019-06-30 05:02:51 -04:00
09c8a45fe2
Merge pull request #8770 from Arturlang/Carp_Deflecting
...
Carp now deflects the bullets instead of making them dissapear.
2019-06-29 20:08:47 -07:00
ad3b709c40
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit97
2019-06-29 06:39:21 +02:00
0371a5513a
Porting in 18 new drinks from the TGstation, plus tweaking and fixes.
2019-06-29 06:03:57 +02:00
c495a2aa47
Merge pull request #8739 from Sishen1542/makinggolemsgreatagain
...
Ports additional tg golem types! Leather, cardboard, bronze & bone. Ports bone hurting juice as well!
2019-06-28 20:32:15 -07:00
1459ada045
adds customization options for podweak
2019-06-28 10:22:09 -04:00
442c21fdba
For the actual deflecting!
2019-06-28 11:41:01 +03:00
d7028b0059
Fixes "Bubbles ate my Cohiba Robusto!"
2019-06-27 05:32:08 +02:00
67312abf04
Update life.dm
2019-06-25 01:37:51 -07:00
b45a789b54
Update life.dm
2019-06-25 01:35:56 -07:00
05f304f9c0
Merge pull request #8692 from Ghommie/Ghommie-cit69
...
[s] Ports "Fixes PDA TK exploits" and "Fixes pride mirror exploit"
2019-06-23 06:56:17 -07:00
dcab96d9d5
Merge pull request #8721 from Ghommie/Ghommie-cit77
...
Ports in "Liver removal/failure now also stops passive reagent effects"
2019-06-23 06:53:30 -07:00
d6a31efaa2
Merge pull request #8684 from Citadel-Station-13/kevinz000-patch-5
...
fixes piggybacking being delayless
2019-06-24 01:31:40 +12:00
6f2fbd8577
Merge pull request #8677 from Trilbyspaceclone/patch-182
...
buffs speedy step quirk by a half
2019-06-23 06:20:58 -07:00
a2a440a92c
golem gang golem gang golem gang golem gang
2019-06-23 04:27:50 -04:00
45109776e1
Ports in "Liver removal/failure now also stops passive reagent effects"
2019-06-22 17:05:08 +02:00
498c35b733
Fixes empathy antag check exploit. ( #8690 )
...
* Fixes exploit
* Wrong way round..!
* Should be okay for antags now.
* Fixed githuba being dumb
2019-06-21 19:33:34 -07:00
771ac9724e
ports Fel connet
...
Shamelessly stealing content
2019-06-21 04:39:10 -04:00
55795355fd
Ports "[s] Fixes pride mirror exploit"
2019-06-19 03:31:36 +02:00
634f11d60d
Update human.dm
2019-06-18 02:34:05 -07:00
4e1ac41393
Update species.dm
2019-06-17 14:41:06 -04:00
bf991cd2da
Underwear overlays Gentials, can toggle each seperately ( #8602 )
...
* Gentials layered under underclothes
* screm
2019-06-17 11:20:25 -07:00
kevinz000