shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
20,183 Commits 5 Branches 0 Tags
2a33dcd3338900cf72e07b8b7b6ef800982f401f
Commit Graph

689 Commits

Author SHA1 Message Date
kevinz000
f38546b21a Merge pull request #8230 from Trilbyspaceclone/patch-97 
[Ready] Makes Mentor chat have better colors as not to confuse Mentors from chat vs helping
 2019-04-20 16:40:09 -07:00
kevinz000
901e748675 Merge pull request #8254 from Poojawa/the-great-vore-escape 
clears blindness on vore OOC escape
 2019-04-20 16:31:59 -07:00
kevinz000
60bc278418 Merge pull request #8227 from Trilbyspaceclone/patch-96 
Magrifle/Magpistol nonlethals now do 2 damage rather than 0
 2019-04-20 16:30:58 -07:00
Poojawa
1f65b1ebdd clears blindness on vore OOC escape 2019-04-17 01:27:08 -05:00
BurgerLua
7ff2b6817b No more seperate whatever 2019-04-16 21:06:57 -07:00
deathride58
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
deathride58
530e021254 Merge pull request #8240 from Poojawa/human-taaaaaaaails 
Fixes missing tail wag states
 2019-04-15 10:01:45 -04:00
deathride58
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
Poojawa
ba2884d2c7 Fixes missing tail wag states 
Also sorts the accessories file a bit more again
 2019-04-13 22:01:55 -05:00
deathride58
a39dd310ba Merge branch 'master' into muzzled-masks 2019-04-13 17:48:24 -04:00
kevinz000
03ae39f95a Merge pull request #8232 from Poojawa/voremobs 
Vore capable simple mobs & fixes
 2019-04-13 00:21:42 -07:00
kevinz000
650b0e6be6 Merge pull request #8231 from Poojawa/hypotweaks 
Labcoats carry mk II hypos, hypokits hold more
 2019-04-13 00:20:05 -07:00
kevinz000
a14092e138 Merge pull request #8216 from Poojawa/lewd-dna 
Adds DNA to semen puddles
 2019-04-13 00:19:20 -07:00
kevinz000
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
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
Trilbyspaceclone
0b58285b53 5 - > 2 2019-04-11 00:36:31 -04:00
Trilbyspaceclone
b3e61f02bc brown from green 2019-04-11 00:11:18 -04:00
Trilbyspaceclone
02f8f89a79 Update magweapon.dm 2019-04-09 09:52:05 -04:00
Trilbyspaceclone
079dd582b8 Update magweapon.dm 2019-04-09 01:26:32 -04:00
kevinz000
a4a1f77c0f Merge pull request #8220 from Poojawa/master 
fixes floaty-leg syndrome for xenos and random color issues
 2019-04-07 15:13:00 -07:00
kevinz000
a4e01f2118 Merge pull request #8214 from Poojawa/loadout-fixes 
Loadout items are forced to backpacks, fixes Security Officer Navy uniform
 2019-04-07 14:49:04 -07:00
Poojawa
294349125e fixes floaty-leg syndrome for xenos 
also fixes random gen colors from bugging out, idk why it was working just fine before but whatever
 2019-04-06 16:32:29 -05:00
deathride58
6259210a33 Merge pull request #8198 from Poojawa/Randomize-tweaks 
Species Spawn tweaks and tauric plasmaman suit icons
 2019-04-05 20:11:59 -04:00
Poojawa
f6988a2a1c Adds DNA to semen puddles 
Consistency's sake, I guess.
 2019-04-05 18:42:22 -05:00
Poojawa
74169ca959 Fixes Navy officer uniform re-ports #7515 2019-04-05 15:08:04 -05:00
Poojawa
906efb8b48 wah alt and travis restart 2019-04-05 05:55:29 -05:00
Poojawa
ebc9c6d8f0 attempts to make slime sprites equally transparent 
also gives them snouts and markings for improvments
 2019-04-04 22:01:52 -05:00
Poojawa
1cbb31c4d2 reeee 2019-04-04 19:27:47 -05:00
Poojawa
d39dbf5c4c corrects a few markings, ensures human tails have more options 2019-04-04 14:43:58 -05:00
kevinz000
3042da96bb Merge pull request #8206 from Poojawa/patch-2 
[S] Sets noisy to false
 2019-04-03 23:44:49 -07:00
deathride58
ec7265d783 Attempts to fix the bug where voreprefs sometimes fail to load at all by making client login force voreprefs to load if vore has been initialized but voreprefs havent 2019-04-03 00:12:09 -04:00
Poojawa
6107b2d2be Update living_vr.dm 2019-04-02 21:03:48 -05:00
kevinz000
3ab3de489b Merge pull request #8123 from deathride58/makessprintingstamlossmakesense 
Makes sprinting not take stamloss in zero gravity or when pulled
 2019-04-02 05:52:05 -07:00
kevinz000
63dd18c790 Merge pull request #8180 from Trilbyspaceclone/Weebo 
adds toy katana and lum eyes to load out - Requested by MrJWhite
 2019-04-02 05:35:31 -07:00
Poojawa
98ce2cb4ef Makes belly noises actually togglable 2019-04-02 02:57:59 -05:00
Poojawa
5d67955268 Slime people should be able to *wag now 2019-04-02 02:31:19 -05:00
Poojawa
83b3c7c4ea Fixes hair issues in preference window 
deletes excess ears check, makes snouts able to be snowflake'd. A few sprite tweaks + bee butt
 2019-04-02 02:31:00 -05:00
deathride58
23fb3cb940 Merge pull request #8131 from Citadel-Station-13/kevinz000-patch-23 
Shift autocall is now accurate to real time rather than game time (you will no longer have 4 hour rounds due to lag)
 2019-03-31 21:41:37 -04:00
deathride58
684d6cf074 Merge pull request #8149 from Ragolution/fixes-the-cum 
Fixes Semen Vent Foam
 2019-03-31 21:25:28 -04: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
Trilbyspaceclone
f006c1e16a Update backpack.dm 2019-03-28 23:20:25 -04:00
Trilbyspaceclone
76bf11b94c Update backpack.dm 2019-03-28 21:35:54 -04:00
Trilbyspaceclone
e45181f670 Update backpack.dm 2019-03-28 21:30:46 -04:00
Poojawa
d4503e77de Chance for quiet belly growls if HONGRY 2019-03-27 10:58:38 -05:00