Commit Graph

185 Commits

Author SHA1 Message Date
Lin 7d0c3df2ad Merge pull request #15755 from timothyteakettle/dullahan-2-electric-boogaloo
dullahans 2: electric boogaloo
2022-12-14 19:07:59 -07:00
Jerry Wester aace737989 Revert "Grant Arachnid Abilities to Driders" 2022-10-19 17:20:52 -06:00
silicons afed04d2fa Merge pull request #15873 from zeroisthebiggay/tallears
tall ears from virgo
2022-10-19 16:15:11 -07:00
zerothebigboy 1f8f5dc071 cocka 2022-10-19 03:49:33 -04:00
zerothebigboy 2fd981a05a penis 2022-10-18 23:57:02 -04:00
zerothebigboy 30bf2312f3 seizure 2022-10-18 23:37:40 -04:00
Jerry Wester 1015987d12 driderman, driderman, does whatever a spider can 2022-10-06 23:38:16 -06:00
zerothebigboy 434d7e0d10 don't lick a pai worst mistake i have ever made please fuck do not do it 2022-08-27 06:29:16 -04:00
Timothy Teakettle 671e5dd872 oh shit oh fuck 2022-08-07 23:53:08 +01:00
Timothy Teakettle 7df374a1f5 IPC PLEASE 2022-08-07 23:51:02 +01:00
Timothy Teakettle 783d22b2d2 some more additions 2022-08-07 23:38:38 +01:00
Timothy Teakettle 7ed2ee82bf core changes 2022-08-04 14:11:42 +01:00
Timothy Teakettle 778bf1777b fixes coiling issue (#15530)
* why

* new signals for resting and stop pulling

these are to be used as signals that will cancel the coiling

* Create coiling.dm

* Update coiling.dm

* adds sprite accessory for coiled naga

* main changes that apply the actual visuals to the coiling mechanics

* adds message to coiling, fixes offset, adds action icon

* coil offset was using old direction

* reordering

* fixes coil sprite not disappearing

* fixes offsets, solves loadout issue

* follows lin's suggestion and adds support for slimes by making it entirely handled in handle mutant

* fix

* Update preferences.dm

* no slimes you're not allowed the hidden sprite
2022-02-28 14:01:57 -08:00
Timothy Teakettle f6b9858f4f adds snake coiling (#15514)
* new signals for resting and stop pulling

these are to be used as signals that will cancel the coiling

* Create coiling.dm

* Update coiling.dm

* adds sprite accessory for coiled naga

* main changes that apply the actual visuals to the coiling mechanics

* adds message to coiling, fixes offset, adds action icon

* coil offset was using old direction

* reordering

* fixes coil sprite not disappearing

* fixes offsets, solves loadout issue

* follows lin's suggestion and adds support for slimes by making it entirely handled in handle mutant
2022-02-23 22:01:13 -07:00
Cognition 014295655c fixing a wrong reference, deco_wings/bat already exists 2021-12-07 19:45:43 -07:00
Cognition 318240bdc6 TG wing port - Now YOU TOO, can be an "angel" 2021-12-07 18:59:07 -07:00
Timothy Teakettle 8ef2ec4ac8 Update body_markings.dm 2021-11-05 15:38:25 +00:00
silicons 69bd477a72 Merge pull request #15039 from keronshb/gradiantport
Ports Colorist Quirk and Hair Gradients Preferences
2021-09-08 20:41:00 -07:00
Lin 3b10346961 Merge pull request #15067 from timothyteakettle/fixes-synth-markings
makes the arm/leg markings for synthetic lizards appear as an option again
2021-09-03 13:52:15 -05:00
Timothy Teakettle cd04aed49e Update synthliz.dm 2021-09-02 18:35:52 +01:00
zerothebigboy dec2ea645e nuts 2021-08-26 22:57:22 -04:00
keronshb 47078e9a85 Ports Hair Gradiants 2021-08-26 11:58:09 -04:00
WanderingFox95 888c6fed15 Since apparently nobody knows what shark tails look like... 2021-08-16 13:52:24 +02:00
WanderingFox95 4a78d8a880 Separates the tails. 2021-08-15 02:21:09 +02:00
Timothy Teakettle e9c7d61dc3 Update tails.dm 2021-07-15 19:13:56 +01:00
zerothebigboy 7dea33f6c2 doge 2021-05-27 16:08:28 -04:00
zerothebigboy 25c99bb23c fuckihatecoding 2021-05-22 11:52:55 -04:00
zerothebigboy 37c3bc23a8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into hair
# Conflicts:
2021-05-22 07:21:02 -04:00
silicons acdb57b0d1 Merge pull request #14739 from WanderingFox95/WanderingFox95-Ears
A small ear related PR (Deer ears, Rabbit ears)
2021-05-22 01:37:05 -06:00
zerothebigboy af24fef322 inari 2021-05-21 20:46:48 -04:00
zerothebigboy f54c893748 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into hair 2021-05-20 18:57:51 -04:00
WanderingFox95 0294ddb2a6 Apply suggestions from code review
Co-authored-by: zeroisthebiggay <43571008+zeroisthebiggay@users.noreply.github.com>
2021-05-19 13:01:13 +02:00
WanderingFox95 4cd8cbd3e4 Same changes for the non human section of the ear file.
consistency.
2021-05-19 12:27:32 +02:00
WanderingFox95 eab45f0d64 Apply suggestions from code review
They're very fair.

Co-authored-by: zeroisthebiggay <43571008+zeroisthebiggay@users.noreply.github.com>
2021-05-19 09:48:38 +02:00
zerothebigboy e7c0dea497 actually an eris hairdo 2021-05-18 22:04:59 -04:00
zerothebigboy 89b2d74895 actually an eris hairdo 2021-05-18 22:00:35 -04:00
WanderingFox95 808e94899f Ear Adjustments 2021-05-19 01:38:28 +02:00
zeroisthebiggay 55383e0387 Update hair_head.dm 2021-05-18 17:27:59 -04:00
zerothebigboy 20ac75020d steponmycock 2021-05-18 17:23:07 -04:00
zeroisthebiggay cc29443b53 Update hair_head.dm 2021-05-18 17:06:20 -04:00
zerothebigboy 2a3eb07bfd steponmycock 2021-05-18 16:57:52 -04:00
timothyteakettle 34869215e8 Merge remote-tracking branch 'upstream/master' into rp-markings-attempt-two 2021-05-14 01:59:32 +01:00
Timothy Teakettle 6095b4724f fixes fox markings legs 2021-05-10 01:54:24 +01:00
zerothebigboy 181dcc347b cum sex balls penis 2021-05-09 04:34:25 -04:00
timothyteakettle bef9473fa1 more migration fixes and general bugfixes 2021-05-07 16:10:20 +01:00
timothyteakettle b1f84f94db Update body_markings.dm 2021-05-06 22:43:31 +01:00
timothyteakettle 80599201cf better fix 2021-05-06 22:39:07 +01:00
timothyteakettle cb12843a34 bugfix 2021-05-06 22:35:15 +01:00
Timothy Teakettle d39a60dd6b casually list the matrixes for several hundred sprites 2021-05-05 21:24:07 +01:00
Timothy Teakettle ea071bd031 comment 2021-05-05 18:28:55 +01:00