shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Butts, nuts, n' tats. (please testmerge or merge & deploy before Halloween ball) (#15304)

Browse Source 
* 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>
This commit is contained in:
BlueWildrose
2022-03-30 20:06:00 -07:00
committed by GitHub
parent 9d6ec35125
commit 3687361ba5
25 changed files with 375 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/limbgrower.dm
+6
View File
@@ -335,6 +335,12 @@
if(!features["breasts_producing"])
boobs.genital_flags &= ~(GENITAL_FUID_PRODUCTION|CAN_CLIMAX_WITH|CAN_MASTURBATE_WITH)
boobs.update()
if(/obj/item/organ/genital/butt)
var/obj/item/organ/genital/butt/ass = new(loc)
if(features["has_butt"])
ass.color = sanitize_hexcolor(features["butt_color"], 6, TRUE)
ass.size = features["butt_size"]
ass.update()
else
new built_typepath(loc)
else
code/game/objects/items/storage/firstaid.dm
+11
View File
@@ -405,6 +405,14 @@
for(var/i in 1 to 10)
new /obj/item/reagent_containers/pill/breast_enlargement(src)
/obj/item/storage/pill_bottle/butt_enlargement
name = "butt enlargement pills"
desc = "May alert security when sneaking around if enough pills are consumed due to assclapping. Be dummy thick responsibly."
/obj/item/storage/pill_bottle/butt_enlargement/PopulateContents()
for(var/i in 1 to 10)
new /obj/item/reagent_containers/pill/butt_enlargement(src)
/obj/item/storage/pill_bottle/neurine
name = "bottle of neurine pills"
desc = "Contains pills to treat non-severe mental traumas."
@@ -551,6 +559,9 @@
new /obj/item/reagent_containers/glass/bottle/vial/small/penisreduction(src)
new /obj/item/reagent_containers/glass/bottle/vial/small/penisreduction(src)
new /obj/item/reagent_containers/glass/bottle/vial/small/penisreduction(src)
new /obj/item/reagent_containers/glass/bottle/vial/small/buttreduction(src)
new /obj/item/reagent_containers/glass/bottle/vial/small/buttreduction(src)
new /obj/item/reagent_containers/glass/bottle/vial/small/buttreduction(src)
/obj/item/storage/hypospraykit/brute
name = "brute trauma hypospray kit"