shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
22,657 Commits 5 Branches 0 Tags
d080446a77f9dc1ef4fd2733288ff7d01e29367a
Commit Graph

2633 Commits

Author SHA1 Message Date
Fermi
d080446a77 Merge branch 'pr/20' 2019-07-28 23:28:19 +01:00
BlackMajor
c8d2410f0e Merge pull request #8961 from Citadel-Station-13/kevinz000-patch-58 
Fixes  subtler anti ghost
 2019-07-28 02:32:42 +12:00
Sishen
1a92134ad3 b 2019-07-25 21:43:02 -04:00
kevinz000
e65d51f493 Update say_vr.dm 2019-07-24 17:31:24 -07:00
kevinz000
eef852aa9a Update mob.dm 2019-07-24 17:10:44 -07:00
kevinz000
8c6b1c8e95 Update say_vr.dm 2019-07-24 17:05:20 -07:00
kevinz000
0f58585e5d Merge pull request #8939 from Ghommie/Ghommie-cit154 
Fixing towels and improving them.
 2019-07-23 20:34:09 -07:00
kevinz000
1028fe458a Merge pull request #8909 from Ghommie/Ghommie-cit143 
Fixes named arg Knockdown calls.
 2019-07-22 20:17:30 -07:00
kevinz000
f114094138 Merge pull request #8926 from Thalpy/Secbats 
Secbats
 2019-07-22 20:15:36 -07:00
Ghommie
e8584720b3 Fixes suit worn overlay for towels. 2019-07-21 11:18:38 +02:00
Thalpy
15ab1a26a4 Merge branch 'master' into master 2019-07-21 01:50:41 +01:00
kevinz000
c657244d9b Merge pull request #8920 from Ghommie/Ghommie-cit149 
Towels.
 2019-07-20 12:06:54 -07:00
Fermi
e5648fd471 Made bat part of previous bat type. 2019-07-19 22:57:22 +01:00
Fermi
4ab5060596 Adds secbats (tested) 2019-07-19 17:07:02 +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
Ghommie
4e6554076c item flags, not clothing flags. 2019-07-18 00:16:14 +02:00
Ghommie
589cdae0e1 Towels 2019-07-18 00:03:49 +02:00
Ghommie
b6f10c96a7 Modularity was a mistake. 2019-07-16 21:05:12 +02:00
Thalpy
9c7b1dee97 Merge branch 'master' into master 2019-07-15 21:23:04 +01:00
Carlen White
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
Carlen White
3504f15c01 Travis Bump 2019-07-14 20:29:23 -04: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