42 Commits

Author SHA1 Message Date
Alphas00 fbc4034f6a Naga Tails coiling
Added the ability to coil people for other naga tails
2025-01-07 17:59:53 +01:00
SandPoot a65f323734 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into proc-define-shit 2024-03-08 19:10:22 -03:00
SandPoot c7a2565255 stop this nonsense 2024-01-05 00:28:56 -03:00
SandPoot 7eaef36e11 d k daunkey kaung 2024-01-03 22:42:03 -03:00
SandPoot 40f1d7401d procs 2023-11-29 22:40:13 -03:00
Jerry Wester aace737989 Revert "Grant Arachnid Abilities to Driders" 2022-10-19 17:20:52 -06:00
Jerry Wester 1015987d12 driderman, driderman, does whatever a spider can 2022-10-06 23:38:16 -06:00
Timothy Teakettle 8db1309195 Update limb_regeneration.dm 2022-07-25 00:18:54 +01:00
silicons dd15cf06b6 Merge pull request #15696 from timothyteakettle/fix-slimes
fixes slimes blood processing (see pr description)
2022-07-08 14:20:40 -07:00
Timothy Teakettle a8687f0cca wow! 2022-06-16 15:07:02 +01:00
silicons 08b532ff42 Update coiling.dm 2022-06-11 01:13:46 -07:00
silicons a4514f9394 Update coiling.dm 2022-06-11 01:08:34 -07:00
LiteralMushroom cfce371c8a You can now actually select a wing color. 2022-05-11 16:06:17 -04:00
LiteralMushroom dd4aa993df wings/deco_wings isn't a real category
fuck
2022-05-07 15:10:27 -04:00
LiteralMushroom ccd9a19356 actual option 2022-05-07 15:05:39 -04:00
LiteralMushroom 73f1417eef first commit (probably doesn't work) 2022-05-07 15:04:06 -04:00
BlueWildrose 3687361ba5 Butts, nuts, n' tats. (please testmerge or merge & deploy before Halloween ball) (#15304)
* Butts

* testicle fix + hidden is back

* updated booba

* prob bad idea actually thinking about icon states

* fuck

* this should be everything now

* SandPoot's suggestion

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>

* tguify that last option

* Revert "tguify that last option"

This reverts commit f9d7a075e997e3d9c0a4f641db43343796cecb98.

* Revert "Merge branch 'master' into cursingcitadel"

This reverts commit 2998b1908a74b381857056f5ce6b34894d950c06, reversing
changes made to 6fc65a28fa4f6012c70675b4cbc0299d7740912a.

* Revert "Revert "Merge branch 'master' into cursingcitadel""

This reverts commit c4a2ad1a630b6376801df3e1cec88aad3d2935ea.

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
2022-03-30 20:06:00 -07:00
silicons ff6ed43bc1 Merge pull request #15438 from LiteralMushroom/patch-5
Makes it so alter form can affect eyes.
2022-03-21 18:56:47 -07: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
LiteralMushroom 40ca396ec7 haha funny stolen code
Co-authored-by: Poojawa <Poojawa@users.noreply.github.com>
2022-01-20 21:58:09 -05:00
LiteralMushroom 41fe2105f8 that didn't work 2022-01-10 18:57:47 -05:00
LiteralMushroom 239782e74a maybe makes it compile 2022-01-10 18:52:16 -05:00
LiteralMushroom fe82ab2504 Update code/modules/mob/living/carbon/human/innate_abilities/customization.dm
Finally.

Co-authored-by: Poojawa <Poojawa@users.noreply.github.com>
2022-01-10 18:47:13 -05:00
DrPainis b224693f67 attempt 3 2021-12-20 19:42:15 -05:00
DrPainis cd6909736e attempt 2 at making it work 2021-12-20 19:35:23 -05:00
DrPainis 05798ef65c makes this do something
probably doesn't work
2021-12-20 19:23:44 -05:00
DrPainis 5a9cf405b0 doesn't work yet
this is just to actually make the PR
2021-12-20 19:18:46 -05:00
silicons 186b552103 merge 2021-10-29 21:50:58 -07:00
Letter N bcdf96f274 Revert "TGUI alerts, lists, inputs" 2021-10-28 12:17:29 +08:00
SandPoot 5aa12b4716 There's a bounty for this right? i spent nearly two full days at this 2021-10-05 18:10:32 -03:00
silicons 275b532a8c Merge remote-tracking branch 'citadel/master' into combat_v7 2021-04-26 14:17:43 -07:00
Blue Wildrose 1dac10b1ec Might as well have it show halo stuff while puddling too 2021-04-01 04:43:18 -07:00
Blue Wildrose b363cdd5ca fixes puddles, cultism checks, spellchecks 2021-04-01 04:29:35 -07:00
silicons 5b2a42f254 Merge remote-tracking branch 'citadel/master' into combat_v7 2021-03-20 14:13:23 -07:00
Timothy Teakettle 71d5528959 fix 2021-03-18 21:50:03 +00:00
silicons c6ba7bfe1f changes 2021-03-06 18:06:53 -07:00
Timothy Teakettle 8c8be2b92e tackle and puddle 2020-12-25 21:45:07 +00:00
silicons 0554ccbba4 fix 2020-11-22 13:32:48 -07:00
silicons 31fa58a9e9 fix 2020-11-22 02:48:37 -07:00
silicons 86b584fab5 typos 2020-11-21 21:08:55 -07:00
silicons 27c4dff507 ports 2020-11-21 21:02:54 -07:00