shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
20,066 Commits 5 Branches 0 Tags
6dc8faf533c5d792f3e9b93b48fcab8479f257fc
Commit Graph
20066 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
TrilbyspacecloneandGitHub 6dc8faf533 Update machine_vending.dm 2019-04-20 14:08:25 -04:00
TrilbyspacecloneandGitHub 769102ed9c Update machine_vending.dm 2019-04-20 14:04:40 -04:00
CitadelStationBot 5f2469df5e Automatic changelog generation for PR #8255 [ci skip] 2019-04-19 16:19:16 -05:00
kevinz000andGitHub c1c198f423 Merge pull request #8255 from BurgerLUA/LoadoutUITweaks 
Improved the layout of the Loadout UI to be more fitting
 2019-04-19 14:19:14 -07:00
CitadelStationBot cc7b5b524b Automatic changelog generation for PR #8252 [ci skip] 2019-04-19 16:18:49 -05:00
kevinz000andGitHub 5f63cfede7 Merge pull request #8252 from BurgerLUA/WhatHaveIFuckingDone 
Tweaks Electric Stimulator + Adds Bonermeter
 2019-04-19 14:18:46 -07:00
BurgerLua 0f838e3e2b Improved the layout of the Loadout UI to be more fitting 2019-04-16 23:37:48 -07:00
BurgerLua 7ff2b6817b No more seperate whatever 2019-04-16 21:06:57 -07:00
deathride58GitHubBurgerLUA
 		fdd0eb4b17 Update modular_citadel/code/modules/integrated_electronics/subtypes/manipulation.dm 
Co-Authored-By: BurgerLUA <BurgerLUA@users.noreply.github.com>
 2019-04-16 15:40:55 -07:00
BurgerLua d49178fd84 Removed debug code, made the arousal input just be a flat value. 2019-04-16 12:10:03 -07:00
BurgerLua dba2b6deaf Tweaks Electric Stimulator + Adds Bonermeter 2019-04-16 11:55:54 -07:00
deathride58andGitHub 05acb8c7a9 Merge pull request #8245 from Poojawa/npc-fix 
rectifies aggressive mobs being Bethesda T-pose aggressive
 2019-04-15 21:31:56 -04:00
Poojawa 838373cbba Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into npc-fix 2019-04-15 10:09:08 -05:00
deathride58andGitHub 530e021254 Merge pull request #8240 from Poojawa/human-taaaaaaaails 
Fixes missing tail wag states
 2019-04-15 10:01:45 -04:00
deathride58andGitHub c6ef9da679 Merge pull request #8239 from Citadel-Station-13/kevinz000-patch-36 
Virgo hairs are now sorted better
 2019-04-15 10:01:13 -04:00
CitadelStationBot 954b3f638d Automatic changelog generation for PR #8237 [ci skip] 2019-04-15 09:00:40 -05:00
deathride58andGitHub aa2eb60b6c Merge pull request #8237 from Poojawa/muzzled-masks 
Muzzled masks
 2019-04-15 10:00:37 -04:00
deathride58andGitHub 13e3c02e8f Merge pull request #8241 from Poojawa/travis-repairs 
Travis repairs and tool folder sync from TG
 2019-04-15 09:33:09 -04:00
Poojawa 295918d77c siiigh. tg NPC code is so bad 2019-04-15 08:10:31 -05:00
Poojawa e6597a192a Fixed duplicate turfs 2019-04-14 00:04:24 -05:00
Poojawa 29f4dfca83 Maps batch fixed 2019-04-13 23:30:22 -05:00
Poojawa 0ae08594a0 These are actually, all 100% unneeded 2019-04-13 23:13:37 -05:00
Poojawa bc619ae7d9 Tool folder and backend TG sync 2019-04-13 22:56:51 -05:00
Poojawa ba2884d2c7 Fixes missing tail wag states 
Also sorts the accessories file a bit more again
 2019-04-13 22:01:55 -05:00
deathride58andGitHub a39dd310ba Merge branch 'master' into muzzled-masks 2019-04-13 17:48:24 -04:00
CitadelStationBot df40dcf553 Automatic changelog generation for PR #8233 [ci skip] 2019-04-13 16:44:52 -05:00
deathride58andGitHub f6ab8f24e9 Merge pull request #8233 from Poojawa/prefwindow-fixes 
Pref Window Alignment + cycled backgrounds from Virgo
 2019-04-13 17:44:50 -04:00
CitadelStationBot dd85f6aac3 Automatic changelog generation for PR #8228 [ci skip] 2019-04-13 02:22:12 -05:00
kevinz000andGitHub 637b92a88a Merge pull request #8228 from Coolgat3/ripley 
Making the Ripley mech not useless (More info inside)
 2019-04-13 00:22:10 -07:00
CitadelStationBot 3f93a5e022 Automatic changelog generation for PR #8232 [ci skip] 2019-04-13 02:21:44 -05:00
kevinz000andGitHub 03ae39f95a Merge pull request #8232 from Poojawa/voremobs 
Vore capable simple mobs & fixes
 2019-04-13 00:21:42 -07:00
kevinz000andGitHub a2c75aad76 Merge pull request #8234 from Trilbyspaceclone/patch-98 
Removes glycerol from tier 4 dispensers
 2019-04-13 00:21:02 -07:00
CitadelStationBot dcc302908c Automatic changelog generation for PR #8235 [ci skip] 2019-04-13 02:20:43 -05:00
kevinz000andGitHub 18c6d4e4f1 Merge pull request #8235 from Poojawa/defib-notouch 
Buffs defib users by making them stop pulling automatically
 2019-04-13 00:20:40 -07:00
CitadelStationBot d45a58aed9 Automatic changelog generation for PR #8231 [ci skip] 2019-04-13 02:20:07 -05:00
kevinz000andGitHub 650b0e6be6 Merge pull request #8231 from Poojawa/hypotweaks 
Labcoats carry mk II hypos, hypokits hold more
 2019-04-13 00:20:05 -07:00
kevinz000andGitHub a14092e138 Merge pull request #8216 from Poojawa/lewd-dna 
Adds DNA to semen puddles
 2019-04-13 00:19:20 -07:00
kevinz000andGitHub 4bc28596c5 Update sprite_accessories.dm 2019-04-12 16:06:46 -07:00
Poojawa c69b0054c8 lavaknights are taur capable now 2019-04-12 04:38:32 -05:00
Poojawa fb234783a7 muzzle-compatible helmets and masks 2019-04-12 04:00:47 -05:00
TrilbyspacecloneandGitHub 690183b14f Update chem_dispenser.dm 2019-04-11 16:08:42 -04:00
Poojawa 3304875e38 Buffs defib users by making them stop pulling automatically 2019-04-11 14:36:41 -05:00
TrilbyspacecloneandGitHub be6dbd415e Update chem_dispenser.dm 2019-04-11 15:07:45 -04:00
Poojawa 8520c91a98 Pref Window Alignment + cycled backgrounds from Virgo 2019-04-11 14:05:40 -05:00
Poojawa 4dcbaa8c80 Refractors simple mob vore code, enables vore mobs 
also just removes the mistake that was hunger sounds.
 2019-04-11 11:15:25 -05:00
Poojawa 45b8889562 Devourable mobs are digestible again 2019-04-11 07:13:19 -05:00
Poojawa 30dbc57e75 Labcoats carry mk II hypos, kits hold more 2019-04-11 06:55:57 -05:00
Poojawa ee15b76397 REH half of the helmets done at this point 2019-04-10 04:46:45 -05:00
Poojawa 7ffe49c511 Merge remote-tracking branch 'refs/remotes/origin/master' into muzzled-masks 2019-04-09 22:18:56 -05:00
CitadelStationBot 13bb5802a3 Automatic changelog generation for PR #8229 [ci skip] 2019-04-09 18:32:03 -05:00