shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
43,568 Commits 5 Branches 0 Tags
08f251a88c898ce3a635909512303170483694de
Commit Graph

2184 Commits

Author SHA1 Message Date
kevinz000 1d649c27de Update robot_movement.dm 2019-10-21 14:38:38 -07:00
Anonymous 32d2476112 Moves stuff from modular, updates sprites 
Also, digitigrade variant is corrected, hopefully.
 2019-10-21 15:24:06 +03:00
kevinz000 9e63413911 Merge pull request #9466 from deathride58/yawnborgs 
Adds a config option to determine the minimum alert level for secborgs (defaulting to red alert)
 2019-10-21 01:04:34 -07:00
kevinz000 838575da50 Merge pull request #9503 from deathride58/tasernerf 
Taser rework - Gives electrodes a debilitating status effect, makes disabler the default taser mode, and more
 2019-10-21 00:59:58 -07:00
kevinz000 95b81b5938 fix 2019-10-21 00:55:15 -07:00
kevinz000 c6c2a703e5 Merge remote-tracking branch 'origin/master' into magrifles_again 2019-10-21 00:47:03 -07:00
Anonymous 6a73abfe32 Adds ASSU suit+helmet and loadout stuff 
Also adds newlines reeeeeeeeeeee
 2019-10-20 23:52:06 +03:00
Ghommie 7e9298d5ac Fixing radio emotes conflict with drunk memes. 2019-10-20 12:21:21 +02:00
kevinz000 c59f15a8bc Merge pull request #9529 from BlackMajor/Yeet 
Syndicate paper masks no longer work in pockets
 2019-10-19 19:53:40 -07:00
Poojawa ffeae20daa Merge remote-tracking branch 'Citadel-Station-13/master' into syntheticbloods 2019-10-18 06:01:52 -05:00
BlackMajor d39897b9ad Update phantomthief.dm 2019-10-18 23:34:31 +13:00
kevinz000 5e049bc64a Merge pull request #9514 from Linzolle/kevin-has-a-foot-fetish 
foot fetish content for kevin (ankle coverings)
 2019-10-17 12:49:08 -07:00
kevinz000 a7a238eafd Merge pull request #9504 from Poojawa/vore-UI-improvements 
Vore fixes and optimizations
 2019-10-17 12:48:01 -07:00
Thalpy 67af19a7f0 Merge branch 'master' into FERMICHEMCurTweaks 2019-10-17 16:20:38 +01:00
Poojawa 66c8c17bbd Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-17 05:45:06 -05:00
Ghommie 475303bd02 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156 2019-10-17 00:50:30 +02:00
Linzolle 1690596047 you asked for this kevin 2019-10-16 15:53:11 -05:00
kevinz000 994bfddc1b Merge pull request #9477 from Thalpy/tgOrganFixes 
[READY] Fixes a few organ code and lets organs freeze based on ambient temperature.
 2019-10-16 12:44:34 -07:00
BlackMajor e8649e5c3c Merge pull request #9506 from izzyinbox/bark 
Adds *bark emote
 2019-10-16 21:00:15 +13:00
Poojawa 184e81eec0 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-16 01:51:51 -05:00
kevinz000 11a93d41de Merge pull request #9499 from r4d6/patch-1 
Add a Blindfold to the loadout list
 2019-10-15 22:57:02 -07:00
izzyinbox 7a91bb4cd3 Adds *bark emote 2019-10-15 10:24:08 -05:00
deathride58 9fd4e7f673 Merge pull request #9472 from Thalpy/Quickfixforfood 
[speedmerge] Quickfixforfood and fixes the chem hindenburg
 2019-10-15 06:32:59 -04:00
deathride58 26d4a2d943 Merge pull request #9493 from Ghommie/Ghommie-cit234 
SDGF ghost poll message made terse, other tweaks.
 2019-10-15 06:27:58 -04:00
Poojawa d5d878e93e moved the values up 2019-10-15 04:09:46 -05:00
Poojawa ff21b992ad Move files and tweaks vore panel stuff 2019-10-15 03:35:00 -05:00
deathride58 50c27df28f Taser rework - Gives electrodes a debilitating status effect, makes disabler the default taser mode, and more 2019-10-15 03:48:44 -04:00
deathride58 b3a81dce01 Secborg buffs - Adds incapacitation functionality to k9 jaws, gives secborg a hybrid taser, tweaks pounces, adds config option to weaken secborgs 2019-10-14 18:18:32 -04:00
r4d6 a824998b89 Add a Blindfold to the loadout list 2019-10-14 11:48:14 -04:00
Ghommie 321c30cf89 now with 51% more loads. 2019-10-14 06:24:54 +02:00
Ghommie 3671755142 My cat resting on my neck is just sooo warm, like a best scarf. 2019-10-14 06:06:25 +02:00
Jay 02b78a2817 changes donator item from glasses to a hat 2019-10-13 17:47:11 -05:00
Thalpy 06599523a9 Ghommie is a saint 2019-10-13 22:06:57 +01:00
Thalpy 3b8ea30d9b I did it 2019-10-12 20:06:46 +01:00
Thalpy f6796b93b3 Fixes graft 2019-10-12 18:22:48 +01:00
Fermi 2e03985696 aaaa 2019-10-12 07:55:19 +01:00
Poojawa 394c947d14 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-11 23:10:45 -05:00
Thalpy 026240098f Fix dupes 2019-10-11 22:25:59 +01:00
Thalpy 6b986632be Merge branch 'master' into FERMICHEMCurTweaks 2019-10-11 22:23:18 +01:00
kevinz000 a9dcf681ce Merge pull request #9457 from Ghommie/Ghommie-cit227 
Fixing a runtime when examining unloaded cit hyposprays.
 2019-10-11 12:16:50 -07:00
kevinz000 2e74833e72 Merge pull request #9444 from Thalpy/Updates-holder 
[Testmerge first] [Ready] Cleans up holder.dm code and fixes some of the cross bugs from shotgun PR merging.
 2019-10-11 12:08:12 -07:00
deathride58 60749f8b07 Adds a config option to determine the minimum alert level for secborgs (defaulting to red alert) 2019-10-11 14:33:32 -04:00
Ghommie 26e6ba9686 Fixing a runtime when examining unloaded cit hyposprays. 2019-10-09 18:34:54 +02:00
Fermi ad0f34cdf8 Tweaks wiki a lil 2019-10-09 06:04:06 +01:00
Ghommie 735755019e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45 2019-10-09 01:18:30 +02:00
Thalpy 9bb045b60a Merge branch 'master' into FERMICHEMCurTweaks 2019-10-08 13:10:35 +01:00
Fermi bc118d5ead Merge branch 'master' into Updates-holder 2019-10-08 12:21:56 +01:00
Fermi b8c87a5f40 Spicy 2019-10-08 12:05:06 +01:00
Poojawa 3113074bfb Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-08 02:55:32 -05:00
kevinz000 922e9849bd Merge pull request #9391 from GrayRachnid/rebalancesk9borgs 
Rebalances k9borg pounce/bite around the secborg's baton.
 2019-10-08 00:36:26 -07:00