Fermi
7a0afda173
Cat patially, MK partially.
2019-07-19 16:19:42 +01:00
Fermi
fbf542134a
Cidadel makes me want to hurt myself.
2019-07-19 05:18:35 +01:00
Fermi
a5fcb918aa
Astrogen tweaks and cat fixes.
2019-07-19 04:11:26 +01:00
Thalpy
9c7b1dee97
Merge branch 'master' into master
2019-07-15 21:23:04 +01:00
kevinz000
628244c0ba
Merge pull request #8869 from Ghommie/Ghommie-cit129
...
Ports "Show codewords on round end screen"
2019-07-14 14:49:11 -07:00
kevinz000
2ec5d3f02e
Merge pull request #8886 from Ghommie/Ghommie-cit137
...
Ports "Refactors NODROP flag into TRAIT_NODROP"
2019-07-14 14:05:20 -07:00
Thalpy
f77bcc9765
Merge branch 'master' into master
2019-07-14 15:10:32 +01:00
kevinz000
b153294a24
Merge pull request #8857 from Ghommie/Ghoomie-cit127
...
Refactoring underwear to allow custom color preferences.
2019-07-14 03:38:45 -07:00
Thalpy
4c4dbd0e17
Merge branch 'master' into master
2019-07-13 19:33:46 +01:00
Fermi
110f0cbb83
Fixes and making a message clearer so people don't think it's admins.
2019-07-13 19:17:19 +01:00
Ghommie
129ca9d71f
Ports "Refactors NODROP flag into TRAIT_NODROP"
2019-07-13 10:27:39 +02:00
kevinz000
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
kevinz000
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
Ghommie
bef0027287
In a haste, we forget thousand things.
2019-07-11 08:50:47 +02:00
Ghommie
081c07098f
randomizing colors.
2019-07-11 08:08:07 +02:00
Ghommie
143410c176
Blame Poojawa for the issue.
2019-07-11 07:39:29 +02:00
Fermi
8f555b0fdd
Reworked Astral, doubled lung damage, fixed lung damage oopsie.
2019-07-10 21:35:47 +01:00
Fermi
ce390fb595
Tweaks to MK
2019-07-09 23:27:37 +01:00
Ghommie
ba7c24a0ec
Refactoring underwear to allow custom color preferences.
2019-07-09 23:25:54 +02:00
Fermi
c12c5be2b6
Merge branch 'master' of https://github.com/Thalpy/Citadel-Station-13
2019-07-09 20:36:19 +01:00
Fermi
3a2192ec2e
Hotfix for captain.
2019-07-09 20:36:16 +01:00
Ghommie
490ae9daf2
Ports "Cleans up saycode by removing random hook stubs and using a signal where relevant"
2019-07-09 07:58:22 +02:00
Thalpy
c418312cc6
Merge branch 'master' into master
2019-07-09 05:33:09 +01:00
deathride58
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
deathride58
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
deathride58
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
deathride58
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
UristMcAstronaut
38b3ace14b
Update pai_shell.dm
2019-07-07 21:09:03 +00:00
Ghommie
49c8a08c15
Removes the ? that suppressed runtimes.
2019-07-07 20:39:40 +02:00
Ghommie
ef745a850d
Fixing lobby ghost roles for real.
2019-07-07 20:38:08 +02:00
kevinz000
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
kevinz000
91f114f717
Merge pull request #8832 from Ghommie/Ghommie-cit116
...
Fixes new player runtime that makes people unable to join rounds.
2019-07-07 02:33:32 -07:00
Thalpy
cc39c9f896
Merge branch 'master' into master
2019-07-06 16:03:17 +01:00
Ghommie
fe2abc990b
Fixes new player runtime that makes people unable to join rounds.
2019-07-06 04:51:56 +02:00
kevinz000
748550895d
Merge pull request #8632 from Arturlang/Traitor_Codeword_Highlight
...
Ports traitor codeword highlighting
2019-07-05 06:57:49 -07:00
kevinz000
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
Fermi
7fa072030b
Update to manage prefs. (and so it doesn't do it the wrong way round.)
2019-07-04 23:44:13 +01:00
Fermi
a915821d1a
Merge branch 'master' of https://github.com/Thalpy/Citadel-Station-13
2019-07-04 23:24:39 +01:00
Fermi
ad37ec08b2
Removing slimejelly req from feedback.
2019-07-04 23:24:18 +01:00
Ghommie
eed30d73a9
Ports "Makes ventcrawl much easier on the client"
2019-07-04 23:28:14 +02:00
Ghommie
b41e289db3
Ports "Fixes default supplypods exploding their contents" & co.
2019-07-04 22:35:13 +02:00
Ghommie
f134d58464
Flak.
2019-07-04 21:37:06 +02:00
Ghommie
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
Thalpy
8a6e669060
Merge branch 'master' into master
2019-07-04 03:14:29 +01:00
kevinz000
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
kevinz000
75f1dca544
Merge pull request #8773 from Sishen1542/podgang
...
Podweak now have all customization options.
2019-07-03 13:46:08 -07:00
kevinz000
10a584c71f
Merge pull request #8776 from Ghommie/Ghommie-cit96
...
Porting in donut fixes, beepsky smash and Neurotoxin reworks.
2019-07-03 13:45:02 -07:00
Ghommie
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
Fermi
5f72277549
Succumb tweak. Ready to merge.
2019-07-02 23:24:35 +01:00
Fermi
381e12f04a
Fixing message_admins.
2019-07-02 22:52:45 +01:00
