9c7b1dee97
Merge branch 'master' into master
2019-07-15 21:23:04 +01: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
f77bcc9765
Merge branch 'master' into master
2019-07-14 15:10:32 +01: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
4c4dbd0e17
Merge branch 'master' into master
2019-07-13 19:33:46 +01:00
110f0cbb83
Fixes and making a message clearer so people don't think it's admins.
2019-07-13 19:17:19 +01:00
129ca9d71f
Ports "Refactors NODROP flag into TRAIT_NODROP"
2019-07-13 10:27:39 +02:00
53642c5104
Merge pull request #8842 from UristMcAstronaut/master
...
allows pais to activate holoform while in a pai connector
2019-07-12 07:36:48 -07: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
8f555b0fdd
Reworked Astral, doubled lung damage, fixed lung damage oopsie.
2019-07-10 21:35:47 +01:00
ce390fb595
Tweaks to MK
2019-07-09 23:27:37 +01:00
ba7c24a0ec
Refactoring underwear to allow custom color preferences.
2019-07-09 23:25:54 +02:00
c12c5be2b6
Merge branch 'master' of https://github.com/Thalpy/Citadel-Station-13
2019-07-09 20:36:19 +01:00
3a2192ec2e
Hotfix for captain.
2019-07-09 20:36:16 +01: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
c418312cc6
Merge branch 'master' into master
2019-07-09 05:33:09 +01: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
81bbab809e
Merge pull request #8821 from Ghommie/Ghommie-cit105
...
Ports "Updates corgi & parrot inventory panels to the same formatting as other mobs"
2019-07-08 17:51:32 -04:00
3be59ba804
Merge pull request #8828 from Ghommie/Ghommie-cit113
...
Ports "Makes ventcrawl much easier on the client"
2019-07-08 17:49:01 -04:00
38b3ace14b
Update pai_shell.dm
2019-07-07 21:09:03 +00:00
e227d5575c
Merge pull request #8825 from Ghommie/Ghommie-cit110
...
Ports "Fixes default supplypods exploding their contents" & co.
2019-07-07 02:34:47 -07:00
cc39c9f896
Merge branch 'master' into master
2019-07-06 16:03:17 +01:00
748550895d
Merge pull request #8632 from Arturlang/Traitor_Codeword_Highlight
...
Ports traitor codeword highlighting
2019-07-05 06:57:49 -07:00
7544748570
Merge pull request #8790 from deathride58/pryablesleepers
...
Tweaks dogborg sleeper insert/resist values, and adds the ability to pry open dogborg sleepers via crowbar
2019-07-05 06:55:18 -07:00
7fa072030b
Update to manage prefs. (and so it doesn't do it the wrong way round.)
2019-07-04 23:44:13 +01:00
a915821d1a
Merge branch 'master' of https://github.com/Thalpy/Citadel-Station-13
2019-07-04 23:24:39 +01:00
ad37ec08b2
Removing slimejelly req from feedback.
2019-07-04 23:24:18 +01:00
eed30d73a9
Ports "Makes ventcrawl much easier on the client"
2019-07-04 23:28:14 +02:00
b41e289db3
Ports "Fixes default supplypods exploding their contents" & co.
2019-07-04 22:35:13 +02:00
f134d58464
Flak.
2019-07-04 21:37:06 +02:00
0361a0a863
Ports "Updates corgi & parrot inventory panels to the same formatting as other mobs"
...
also "Makes Corgi collars removable"
2019-07-04 21:33:56 +02:00
8a6e669060
Merge branch 'master' into master
2019-07-04 03:14:29 +01: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
1fd50cc15a
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit96
2019-07-03 04:52:57 +02:00
5f72277549
Succumb tweak. Ready to merge.
2019-07-02 23:24:35 +01:00
381e12f04a
Fixing message_admins.
2019-07-02 22:52:45 +01:00
27aad8f117
Quick in case.
2019-07-02 22:42:07 +01:00
946fbff999
+Yamerol, tweaked PE, tweaked CM3000, tweaked medpH.
2019-07-02 22:15:32 +01:00
d83fe49556
+lewdchem pref on CC -EnthrallExpo from botany, tweaks messages on EExpo
2019-07-02 15:03:19 +01: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
1efd1b2634
oh, and lets add a length check real quick to make sure the sleeper actually has shit in it
2019-06-30 04:35:34 -04:00
cb5ed2d2cd
Tweaks dogborg sleeper insert/resist values, and adds the ability to pry open dogborg sleepers with a crowbar
2019-06-30 04:29:48 -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
696d879874
Merge branch 'master' into master
2019-06-29 15:48:25 +01: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
Thalpy