403 Commits

Author SHA1 Message Date
Ghommie c58efa64c1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45 2019-07-03 02:36:23 +02: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
Ghommie 3cbe9cf6b0 componentization part 1: "The flawed theorical code" 2019-06-10 22:37:38 +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
Poojawa 72751a9efc Sorts and cleans up some sprites
adds guilmon things to lizards as well, since they didn't have it I guess
2019-04-29 04:33:23 -05:00
kevinz000 a5e750e20f skintone 2019-04-23 19:06:00 -07:00
kevinz000 ab090bd2c1 Start 2019-04-22 21:54:10 -07:00
Poojawa f244d3fdca system's mostly working
need to polish out the get_blood_dna_list runtime
2019-04-16 11:30:36 -05:00
Poojawa b3e894dcbb oh god oh fuck oh god it's snowballing 2019-04-16 07:40:37 -05: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
deathride58 905f32b193 further optimizes performance by making all of the meta gas properties use their own individual lists instead of being in a messy nested list 2019-04-14 16:40:37 -04:00
deathride58 41375d9737 Increases performance significantly by turning garbage collection into a define 2019-04-14 11:33:28 -04:00
deathride58 2c9deab42e removes add_gas() and assert_gas(). next up: do further testing with garbage_collect() present and not present 2019-04-14 10:33:39 -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 4bc28596c5 Update sprite_accessories.dm 2019-04-12 16:06:46 -07:00
Poojawa fb234783a7 muzzle-compatible helmets and masks 2019-04-12 04:00:47 -05:00
deathride58 8b75240d89 fuck atmos - attempts to optimize atmos by removing GAS_META from the gas mixture meta list and removing the usage of gas archive 2019-04-11 17:07:11 -04: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 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