shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
19,833 Commits 5 Branches 0 Tags
21682f951e6de4ecbb0282011c12c0f6b8d4e602
Commit Graph

19833 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
deathride58
21682f951e Merge pull request #8159 from Poojawa/lizard-hyperoxia 
Carbon Oxygen Toxicity
 2019-03-31 21:20:57 -04:00
CitadelStationBot
f45ebe29d7 Automatic changelog generation for PR #8164 [ci skip] 2019-03-31 20:19:24 -05:00
deathride58
2ed9045173 Merge pull request #8164 from Poojawa/vore-mechanic-fixes 
[Ready] Vore interactions, feeding, UI cleanup!
 2019-03-31 21:19:20 -04:00
nik707
169300d39c Merge pull request #8181 from Zandario/master 
PDA Soundpack
 2019-03-31 12:09:23 -05:00
CitadelStationBot
d763eec341 Automatic changelog generation for PR #8167 [ci skip] 2019-03-30 16:26:56 -05:00
nik707
6561c7e364 Merge pull request #8167 from deathride58/fuckcult 
Fixes the narsie summon rune not actually looking for the 8 other cult members surrounding it (IN LAYMEN'S TERMS, MAKES IT WORK)
 2019-03-30 16:26:53 -05:00
nik707
a406c40949 Merge pull request #8174 from Trilbyspaceclone/Tea 
Places the pink milk and pink tea icons into the correct places
 2019-03-30 16:26:25 -05:00
Zandario
7877cadcad Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into zandario-sound-overhaul 2019-03-29 14:28:31 -05:00
Zandario
30ff894398 Adds PDA Sounds 
Adds new sound files and gives the PDA life!
 2019-03-29 14:18:34 -05:00
Poojawa
34ce97ef33 flip it turnways 2019-03-27 23:26:33 -05:00
CitadelStationBot
86955844b6 Automatic changelog generation for PR #8169 [ci skip] 2019-03-27 23:04:24 -05:00
deathride58
3a34466783 Merge pull request #8169 from Poojawa/taurbloodisdumb 
Taur blood no longer offsets normal suits
 2019-03-28 00:04:22 -04:00
Poojawa
d4503e77de Chance for quiet belly growls if HONGRY 2019-03-27 10:58:38 -05:00
Poojawa
88d6cf7da8 actually fix the god-damned sound issues. fuck 2019-03-27 10:33:06 -05:00
Poojawa
e6190fa141 Make combat mode actually override the VM icon 2019-03-27 04:23:37 -05:00
Poojawa
181b29e08c slightly better commenting 2019-03-27 03:46:30 -05:00
Poojawa
6fdb5e97f8 removes debug and override 2019-03-27 03:43:18 -05:00
Poojawa
8d84299d6d Feeding works! aaaaayyy. Didn't have to martial art it either 2019-03-27 03:18:41 -05:00
Trilbyspaceclone
c2b25607fe Add files via upload 2019-03-26 21:10:59 -04:00
Trilbyspaceclone
6254170dc1 Delete drinks.dmi 2019-03-26 21:10:33 -04:00
Trilbyspaceclone
d231c7d1c5 Delete drink.dmi 2019-03-26 21:10:18 -04:00
Poojawa
49c518012b Properly account for tauric mode 2019-03-25 04:32:27 -05:00
Poojawa
b11e3bbc96 Vore mode button and feeding 2019-03-25 04:19:00 -05:00
deathride58
fb615dbb07 fUCKING CULTCODE 2019-03-24 01:11:12 -04:00
Poojawa
bdfc3273b8 oops I commited before test compiling 2019-03-23 07:44:29 -05:00
Poojawa
e8dcb44317 Prevents teleport mice teeth 2019-03-23 07:43:55 -05:00
CitadelStationBot
520f46c933 Automatic changelog generation for PR #8160 [ci skip] 2019-03-22 21:23:04 -05:00
kevinz000
cb2259a7ae Merge pull request #8160 from Poojawa/lizard-normalization 
Lizard Fixes
 2019-03-22 19:23:01 -07:00
CitadelStationBot
869933b786 Automatic changelog generation for PR #8146 [ci skip] 2019-03-22 21:16:19 -05:00
kevinz000
e19ee499a2 Merge pull request #8146 from deathride58/separateoocandlooc 
Makes OOC and LOOC actually use different toggles
 2019-03-22 19:16:17 -07:00
CitadelStationBot
996e3c8f47 Automatic changelog generation for PR #8118 [ci skip] 2019-03-22 21:14:12 -05:00
kevinz000
56b1857e30 Merge pull request #8118 from deathride58/PROPERFUCKINGDNRS 
makes the DNR status affect ghost role (event and spawner roles) eligibility, makes cryopods always apply DNR status, and readds suicide + ghost admin logging
 2019-03-22 19:14:07 -07:00
CitadelStationBot
137b8f8063 Automatic changelog generation for PR #8145 [ci skip] 2019-03-22 21:13:22 -05:00
kevinz000
0929a7e88b Merge pull request #8145 from deathride58/verboseirclogsforbunker 
Makes panic bunker toggling and bypassing be logged in IRC
 2019-03-22 19:13:18 -07:00
CitadelStationBot
08964ee541 Automatic changelog generation for PR #8140 [ci skip] 2019-03-22 18:23:02 -05:00
nik707
aae0714cee Merge pull request #8140 from deathride58/LETSTRYFIXINGLAG 
lets try fixing lag during highpop - makes mouse movements only call onmousemove in combat mode
 2019-03-22 18:23:00 -05:00
CitadelStationBot
292af850af Automatic changelog generation for PR #8141 [ci skip] 2019-03-22 18:22:46 -05:00
nik707
10159fe976 Merge pull request #8141 from deathride58/nerfsdinks 
Nerfs dinks - Ballistic projectiles are now the only projectiles that can emit a dink
 2019-03-22 18:22:44 -05:00
nik707
af0b92cb84 Merge pull request #8154 from Citadel-Station-13/kevinz000-patch-27 
fixes forcefield exploit
 2019-03-22 18:21:37 -05:00
nik707
b3776a2e3c Merge pull request #8155 from Citadel-Station-13/kevinz000-patch-29 
forcefields can no longer be stacked
 2019-03-22 18:21:24 -05:00
nik707
6d8b634abc Merge pull request #8156 from Citadel-Station-13/kevinz000-patch-30 
Brig timers now ignore time dilation/lag because people getting more punished for the server lagging is unfair
 2019-03-22 18:20:54 -05:00
Poojawa
df0aa7cadb missing ) in macro call 2019-03-22 17:16:38 -05:00
Poojawa
ae02f091ff Dragon fixes, UI fixes 2019-03-22 15:06:36 -05:00
Poojawa
c8cd7d89b6 fixes overbright digi legs on lizards 
also removes their excessive snouts to stop being abominations
 2019-03-21 15:31:07 -05:00
Poojawa
8893108130 actually completely pointless of a check, so let's not fuck with it 2019-03-21 15:15:47 -05:00
Poojawa
fbc2b15d21 Make sure the oxygen max doesn't do fucky things 2019-03-21 15:13:11 -05:00
Poojawa
0ffa3f6670 carbon Oxygen toxicity 2019-03-21 15:05:58 -05:00
deathride58
974420eb5a Merge pull request #8150 from Trilbyspaceclone/patch-84 
MIRROR - Fixes runtime from attempting checking armor on missing bodypart, improves ran_zone selection mechanism #43222
 2019-03-21 15:33:34 -04:00
deathride58
e49ef21298 Merge pull request #7984 from Citadel-Station-13/kevinz000-patch-19 
Monkey cubes are now baymed tiers of lethal if you eat them raw as a carbon based lifeform.
 2019-03-21 15:23:28 -04:00
deathride58
e3248276cd Merge pull request #8127 from Citadel-Station-13/kevinz000-patch-7 
cult/clockcult minimum players 20 --> 30 , both cults get one more minimum amount cultists and one more maximum automatic scaled cultist
 2019-03-21 15:13:08 -04:00