141 Commits

Author SHA1 Message Date
evilew c1b7866891 balls fluid
- added balls fluid code
2024-11-22 21:20:24 +01:00
AlManiak 912c914f5e Initial commit 2024-11-02 21:51:17 +01:00
AlManiak 2eb2659590 Fix for belly_visibility
Inflation added
cleanup of warnings
Fixed arousal hud genital visibility menu
2024-10-14 16:53:47 +02:00
Metis be7d332d85 belly 2024-09-14 15:29:13 -04:00
SandPoot 24ee6077c7 push changes 2022-10-23 00:18:03 -03:00
Artur c36019bf56 Adds stasis beds 2022-04-06 15:38:05 +03: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
keronshb f1ca283318 Merge branch 'master' into familyport 2022-02-11 14:04:57 -05:00
SandPoot 8510dcc08a Ports tgui stripping (finally) (#15401)
* Upload files

* Update items.dm

* Update files

* Update files

* Update strippable.dm

* Update strippable

* Update strippable.dm

* Upload files

* Update files

* Update files

* Update files

* update files

* Update files

* Update dog.dm

* Update strippable.dm

* Update equipping

* Update strippable.d

* Upload files

* Upload files

* Update monkey.dm
2021-12-30 07:40:15 +01:00
keronshb 6331ced3e5 The rest of the offering stuff 2021-10-13 22:13:33 -04:00
keronshb 7ed5f622f4 Dynamic 2021-09-14 19:33:17 -04:00
Timothy Teakettle c51fa954cf Update mobs.dm 2021-05-10 14:51:18 +01:00
Timothy Teakettle be9b1ddffb fixes 2021-05-10 14:43:45 +01:00
Timothy Teakettle 3c7137f951 what if we didnt break 90% of the game 2021-05-05 18:19:02 +01:00
Timothy Teakettle ba71bb944a im not crazy but this commit breaks 90% of the game 2021-05-05 18:11:05 +01:00
SandPoot e6c23728eb upload files 2021-04-23 12:56:11 -03:00
Tupinambis d2860b38c7 normalization 2020-10-01 18:46:31 -05:00
Tupinambis 113b84ab50 Ports arachnids from WaspStation 2020-09-30 15:10:17 -05:00
Timothy Teakettle f5300750b5 Revert "[TESTMERGE ONLY] FUCK" 2020-08-17 03:18:36 +01:00
silicons 4cd731ce11 Revert "cease your shitcode: cum edition" 2020-08-16 19:06:57 -07:00
timothyteakettle 1f240b883f holy shit 2020-08-11 03:37:04 +01:00
Putnam 9bb3ba5c5a added ethereals 2020-08-08 00:08:43 -07:00
silicons 03f0d76a8e yeah ok 2020-07-23 13:23:45 -07:00
Detective Google da68163c80 ghosts now appear at round-end 2020-06-22 15:43:32 -05:00
Lin bfe8ccdfb5 Merge pull request #11627 from kevinz000/combat_rework
"Unofficial" Combat Rework Part 3: Blocking/Parrying
2020-06-12 16:39:11 -05:00
Yawet330 fabfd684ce Silicon Flavortexts. (SCRUTINISE HEAVILY) (#12395)
* Part 1 - Adding the component

* Part 2 - Making the WRITE_FILE before changing the pref menu.

* Part 3 - Mirroring existing code, instead of tacking it on because im both lazy, and want a distinction

* Part 4 - Changes the preference tab to accomodate this.

* we made a brief fucky wucky!

* make it look noice

* fuckywucky mk2

* Part 5 - make it apart of the helper list (woops)

* that'yll do it.

* maybe fix?

* nope, just hit the delete button on their flavortext entirely :agony:

* Update preferences_savefile.dm

* Update silicon.dm

* Update preferences.dm

* Update silicon.dm
2020-06-04 15:53:39 -07:00
kevinz000 05068f80db Merge remote-tracking branch 'citadel/master' into combat_rework 2020-05-07 10:57:10 -07:00
kevinz000 f034c7c536 Merge remote-tracking branch 'citadel/master' into combat_rework 2020-05-05 17:38:43 -07:00
Ghommie ccfce7cb64 Makes wings/horns colors dna features instead of human defines 2020-05-05 06:22:58 +02:00
Ghommie 42d7d57ad6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit698 2020-05-02 19:17:48 +02:00
kevinz000 d9b6ea5181 Merge pull request #11847 from Ghommie/Ghommie-cit679
A peeve with random bodies.
2020-04-25 16:59:07 -07:00
Ghommie e9bf432a0d Scavenging element. 2020-04-22 03:30:40 +02:00
Ghommie c774f18758 . 2020-04-14 19:18:08 +02:00
Ghommie 571584901c Custom skin tone preferences. 2020-04-14 19:10:28 +02:00
Ghom 55402b1834 Merge branch 'master' into Ghommie-cit679 2020-04-14 16:22:00 +02:00
Ghom a57828703e Update mobs.dm 2020-04-14 16:09:31 +02:00
Ghommie e753c1ad14 Fixed a little peeve with random bodies. 2020-04-14 02:20:19 +02:00
Ghommie fe4b270568 Sprite size preferences?! Oh no! 2020-04-12 05:08:49 +02:00
kevinz000 234687c5c8 do_after_advanced 2020-04-11 05:10:07 -07:00
Artur 65ec9f3723 Merge remote-tracking branch 'Citadel-Station-13/master' into skateboards_cool_again 2020-04-01 13:03:06 +03:00
Artur 4de14fbdf7 Finnishing touches 2020-04-01 12:59:06 +03:00
Artur f40f07b033 [READY]Skateboard overhaul (#45657)
* skeet skeet

* scoot

* removes debug message

* merge conflict

* oopsie

* polish, new board types

* begone

* actioninja review

* passtable trait

* fixes indent

* dwarfism check

* check for existing flag

* check existing trait

* screwdriver returns FALSE
2020-04-01 12:05:27 +03:00
Ghommie e26b43d80b The banishment of the floating disembodied phallus. 2020-03-31 02:40:28 +02:00
Ghommie c9f02d97a1 Privates Visibility Preferences. Also Undergarments having a purpose. 2020-03-25 02:47:16 +01:00
kevinz000 3990b1f4c9 Merge pull request #11571 from Ghommie/Ghommie-cit635
Size preferences made configurable.
2020-03-23 10:37:54 -07:00
Ghommie 76ff0d4931 M/F body preferences. 2020-03-22 19:47:48 +01:00
Ghommie 6d4433dd77 Size preferences made configurable. 2020-03-22 01:07:51 +01:00
Ghommie 6c6b2a42eb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit629 2020-03-21 15:04:35 +01:00
Ghommie eeab3ed11f Everyday 2020-03-19 17:34:01 +01:00
Ghommie dd7046cbd1 no comment 2020-03-19 16:53:58 +01:00