shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
23,200 Commits 5 Branches 0 Tags
cede93299edeca080bcff09a0a7d0d0b028f1e02
Commit Graph

222 Commits

Author SHA1 Message Date
Poojawa
569e33fdbc Update human.dm 2019-08-17 05:55:47 -05:00
Poojawa
2d40733ff7 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-08-17 05:43:05 -05:00
deathride58
5dddb11773 Fixes handcuffs being impossible to actually resist out of 2019-08-11 08:37:00 -04:00
Poojawa
283b5d050e Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-08-08 16:51:53 -05:00
BlackMajor
98cecb2cc7 Merge pull request #8923 from Citadel-Station-13/kevinz000-patch-53 
Removes damage from *dab
 2019-08-06 21:47:52 +12:00
Ghommie
cf81a57efa Adds in turf density checks, replaced object density checks with CanPass() 2019-08-05 05:33:47 +02:00
Poojawa
7d65ddb417 bug blood, ipc/slime hearts, blood gen protolathe 
we're all gucchi now boys
 2019-08-04 04:07:44 -05:00
Poojawa
3499d73f6b Merge remote-tracking branch 'refs/remotes/origin/master' into syntheticbloods 2019-07-31 19:24:39 -05: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
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
kevinz000
1028fe458a Merge pull request #8909 from Ghommie/Ghommie-cit143 
Fixes named arg Knockdown calls.
 2019-07-22 20:17:30 -07:00
kevinz000
a28d6b2b5a Update cit_emotes.dm 2019-07-18 13:22:44 -07:00
deathride58
7b39c0935c Merge pull request #8415 from Citadel-Station-13/sprint_stamina 
Adds a sprint buffer - 35 tiles, regen 2 tiles/second (always active), 0.3 stamcost per tile if empty (as old) directly applied to staminaloss rather than stamina action buffer (unlike old)
 2019-07-17 18:07:57 -04:00
Ghommie
b6f10c96a7 Modularity was a mistake. 2019-07-16 21:05:12 +02:00
deathride58
a27222fba7 Merge pull request #8752 from Sishen1542/uhhhhh 
Slimepeople can now morph the shape and size of their genitalia.
 2019-07-13 20:15:28 -04: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
490ae9daf2 Ports "Cleans up saycode by removing random hook stubs and using a signal where relevant" 2019-07-09 07:58:22 +02:00
Poojawa
52f48c9294 let's keep them feedable at least, because that's a thing 2019-07-03 01:36:16 -05:00
Poojawa
c974fa1f63 Adjusts some bad copy/pasta code 
Oops
 2019-07-03 01:33:43 -05:00
Sishen
7813536d78 might as well add breast shapes to the mix 2019-06-26 09:50:35 -04:00
Sishen
4d51214526 and tool length and breast size too 2019-06-25 22:36:36 -04:00
Sishen
2736596293 Morphing Genitalia! 2019-06-25 22:03:10 -04:00
Sishen1542
2bb56a900a Dab emote now checks restraint flags. (#8672) 
* Update cit_emotes.dm

* Revert "Update cit_emotes.dm"

This reverts commit 649007667db6f7d1fdd0f30e99bbaa268fbeb03c.

* Revert "Revert "Update cit_emotes.dm""

This reverts commit 7950f642bf32b4179d265fdb498451c3e05a10fe.
 2019-06-23 06:00:07 -07:00
poptar4551
88dd4bdc99 Brings back Big Wolf ears for humans (#8668) 
* Brings back Big Wolf ears for humans

This use to be here, and I'm no furry, but it needed to come back.

* Update modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm

Co-Authored-By: Poojawa <Poojawa@users.noreply.github.com>

* Update modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm

Co-Authored-By: Poojawa <Poojawa@users.noreply.github.com>

* Update modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm

Co-Authored-By: Poojawa <Poojawa@users.noreply.github.com>

* Update modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm

Co-Authored-By: Poojawa <Poojawa@users.noreply.github.com>
 2019-06-21 19:32:21 -07:00
kevinz000
3527664c40 Merge branch 'master' into sprint_stamina 2019-06-16 19:55:56 -07:00
Ghommie
05066f241b Improving keborgs' movement, not removing. 2019-06-15 20:33:38 +02:00
Ghommie
280e7d7d81 stops borgs from sprinting into negative cell charge. 2019-06-15 04:36:40 +02:00
Poojawa
69cefb604b just need to fine tweak gibs and we're gucci 2019-06-09 11:10:23 -05:00
kevinz000
be9a551eea Merge pull request #8566 from Ghommie/Ghommie-cit39 
Different combat mode message if user is on help intent.
 2019-06-08 12:05:17 -07:00
Ghommie
53d5ad5820 no exclamation point. 2019-06-08 14:45:26 +02:00
Ghommie
fc536dcfe4 Urist McSpaceman goes vigilant! 
Urist McSpaceman seems attentive!
Urist McSpaceman looks alert!
 2019-06-08 14:44:40 +02:00
kevinz000
ab565d2483 Merge pull request #8547 from Ghommie/Ghommie-cit29 
Moves traits to datums and turn the accessors into defines
 2019-06-08 01:22:16 -07:00
Ghommie
57246b5c4f No combat mode message if user is on help intent. 2019-06-07 19:36:09 +02:00
deathride58
aa53cc9ea9 Merge branch 'master' into fuckatmos 2019-06-07 04:38:47 -04:00
Poojawa
6b82c985ae Revert "fuckit, I'm just gunna wholesale port from baycode I guess" 
This reverts commit 11d10d3805.
 2019-06-06 19:39:22 -05:00
Ghommie
d3d2b8d898 should be ready. 2019-06-06 19:24:20 +02:00
Poojawa
11d10d3805 fuckit, I'm just gunna wholesale port from baycode I guess 2019-06-05 04:55:36 -05:00
CalamaBanana
a37f84fb9b Ports RP Deer taur and adds Elf Ears to Mammals 
Ports RP Deer taur and adds Elf Ears to Mammals
 2019-06-01 17:28:17 +02:00
kevinz000
b77e0a0943 buff 2019-05-25 22:33:10 -07:00
kevinz000
b5c699cea8 adjustments 2019-05-25 21:57:25 -07:00
deathride58
4fc31f6322 Merge branch 'master' into fuckatmos 2019-05-25 15:34:06 -04:00
kevinz000
5d40d4b9a2 sprint stamina stuff 2019-05-22 12:18:47 -07:00
Poojawa
f6f4c946e6 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-05-22 00:08:13 -05:00
Poojawa
4f75f68a5d make hostile mobs gurgle people 2019-05-17 05:13:30 -05:00
Poojawa
0f6677b956 Blood colors happens to footprints now. 
Different prints not working. splatter effect not working, I'm just sick of looking at this right now.
 2019-05-16 08:23:53 -05:00
Poojawa
7b6a65ce3b okay we're starting to pass our blood type to bloodmeme now 
STILL JUST FUCKING FOOTSTEPS LEFT THO GOD FUCKING DAMNIT
 2019-05-09 08:17:18 -05:00
Poojawa
5ad532f723 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-05-09 03:08:54 -05:00
deathride58
0d65e3d1ab Merge pull request #8306 from Poojawa/helmet-fiasco 
Muzzled Medical hardsuit fix and sprite organization
 2019-05-06 21:58:44 -04:00