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

2577 Commits

Author SHA1 Message Date
kevinz000
8452cf3b8a Merge pull request #9014 from Ghommie/Ghommie-cit170 
undergarment fixes.
 2019-08-04 19:13:21 -07:00
kevinz000
f8dbe71bf7 Merge pull request #9035 from Poojawa/vore-toggle-fix 
Fixes a runtime with a simple mob verb
 2019-08-04 19:12:57 -07:00
kevinz000
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
kevinz000
4dcdf7ac4d Merge pull request #9044 from Sishen1542/rock-lock 
Adds the ability to construct and deconstruct locker locks
 2019-08-04 19:07:35 -07:00
kevinz000
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
Sishen
1f100f1f3b crush my lock with a rock i must 2019-08-03 18:48:14 -04:00
kevinz000
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
Linzolle
bc9bca8d04 oh my god 2019-08-02 01:20:32 -05:00
Poojawa
b5fcaf20e6 Fixes a runtime with a simple mob verb 2019-08-01 17:40:43 -05:00
BurgerLua
c0698bd220 whitespace 2019-07-31 16:40:49 -07:00
BurgerLua
3baac83021 Added 2019-07-31 16:40:35 -07:00
Ghommie
ec2a3ea778 Ports "Bluespace research updates" and "Teleportation standardization, channels, and interception" 2019-07-31 18:56:00 +02:00
Ghommie
397c62bf7a undergarment fixes. 2019-07-31 16:19:25 +02:00
kevinz000
26c195dec8 Merge pull request #8971 from Linzolle/toxiclover 
makes slimepeople like toxic food
 2019-07-29 04:39:12 -07:00
kevinz000
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
Ghommie
6f33856ae7 Makes staminaloss also apply the oxyloss fullscreen overlay. 2019-07-28 18:51:19 +02: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
Ghommie
1adaf01839 Fixes combatmode disarm pushing people on inaccessible tables and more. 2019-07-26 22:55:46 +02:00
Linzolle
99720f12e5 makes slimepeople like toxic food 2019-07-25 20:55:18 -05: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
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
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
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
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
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
Ghommie
ba7c24a0ec Refactoring underwear to allow custom color preferences. 2019-07-09 23:25:54 +02: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
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