shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
22,034 Commits 5 Branches 0 Tags
04c3b0e66e2bc2c60d2307e7faaa52a43151ec34
Commit Graph

185 Commits

Author SHA1 Message Date
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
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
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
Ghommie
d3d2b8d898 should be ready. 2019-06-06 19:24:20 +02: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
deathride58
4fc31f6322 Merge branch 'master' into fuckatmos 2019-05-25 15:34:06 -04:00
Poojawa
4f75f68a5d make hostile mobs gurgle people 2019-05-17 05:13:30 -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
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
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
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
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
2ed9045173 Merge pull request #8164 from Poojawa/vore-mechanic-fixes 
[Ready] Vore interactions, feeding, UI cleanup!
 2019-03-31 21:19:20 -04:00
Poojawa
e6190fa141 Make combat mode actually override the VM icon 2019-03-27 04:23:37 -05:00
Poojawa
6fdb5e97f8 removes debug and override 2019-03-27 03:43:18 -05:00
Poojawa
8d84299d6d Feeding works! aaaaayyy. Didn't have to martial art it either 2019-03-27 03:18:41 -05:00
Poojawa
b11e3bbc96 Vore mode button and feeding 2019-03-25 04:19:00 -05:00
Poojawa
c8cd7d89b6 fixes overbright digi legs on lizards 
also removes their excessive snouts to stop being abominations
 2019-03-21 15:31:07 -05:00
deathride58
dcea7886d8 Makes sprinting stamloss make sense by making sprinting take no stamloss in no gravity or when being pulled 2019-03-15 20:25:44 -04:00
kevinz000
821a31afb8 Merge pull request #8090 from deathride58/tgpushes 
Replaces disarm right click action with tgstation/tgstation#42958's disarm pushes
 2019-03-10 13:51:44 -07:00
deathride58
e5f5520393 Merge pull request #8075 from BlackMajor/master 
More borg sprites
 2019-03-08 20:50:33 -05:00
deathride58
943cc7d969 Apply suggestions from code review 
Co-Authored-By: Poojawa <Poojawa@users.noreply.github.com>
 2019-03-05 00:30:06 -06:00
deathride58
9ae4ffb025 updates PR up to commit acc5a15 2019-03-05 01:06:54 -05:00