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

Fixes (see dev discussion)

Browse Source
This commit is contained in:
Fermi
2019-06-25 23:06:55 +01:00
parent eb2dc63a54
commit 3928e027b4
12 changed files with 63 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_citadel/code/game/machinery/vending.dm
+3 -2
View File
@@ -26,12 +26,13 @@
/obj/item/storage/hypospraykit/toxin = 2,
/obj/item/storage/hypospraykit/o2 = 2,
/obj/item/storage/hypospraykit/brute = 2,
/obj/item/storage/hypospraykit/enlarge = 2,
/obj/item/reagent_containers/glass/bottle/vial/small = 5)
/obj/machinery/vending/wardrobe/chap_wardrobe
premium = list(/obj/item/toy/plush/plushvar = 1,
/obj/item/toy/plush/narplush = 1)
#define STANDARD_CHARGE 1
#define CONTRABAND_CHARGE 2
#define COIN_CHARGE 3
modular_citadel/code/game/objects/items/storage/firstaid.dm
+16
View File
@@ -103,6 +103,22 @@
new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/dexalin(src)
new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/dexalin(src)
/obj/item/storage/hypospraykit/enlarge
name = "organomegaly trauma hypospray kit"
icon_state = "enlarge-mini"
item_state = "firstaid-brute"
/obj/item/storage/hypospraykit/enlarge/PopulateContents()
if(empty)
return
new /obj/item/hypospray/mkii(src)
new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/breastreduction(src)
new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/breastreduction(src)
new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/breastreduction(src)
new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/penisreduction(src)
new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/penisreduction(src)
new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/penisreduction(src)
/obj/item/storage/hypospraykit/brute
name = "brute trauma hypospray kit"
icon_state = "brute-mini"
modular_citadel/code/modules/arousal/organs/penis.dm
+1 -1
View File
@@ -12,7 +12,7 @@
size = 2 //arbitrary value derived from length and girth for sprites.
var/length = 6 //inches
var/cached_length //used to detect a change in length
var/girth = 0
var/girth = 4.38
var/girth_ratio = COCK_GIRTH_RATIO_DEF //0.73; check citadel_defines.dm
var/knot_girth_ratio = KNOT_GIRTH_RATIO_DEF
var/list/dickflags = list()
modular_citadel/code/modules/reagents/chemistry/reagents/enlargement.dm
+10 -3
View File
@@ -27,7 +27,7 @@
overdose_threshold = 12
metabolization_rate = 0.25
ImpureChem = "BEsmaller" //If you make an inpure chem, it stalls growth
InverseChemVal = 0.3
InverseChemVal = 0.35
InverseChem = "BEsmaller" //At really impure vols, it just becomes 100% inverse
/datum/reagent/fermi/breast_enlarger/on_mob_add(mob/living/carbon/M)
@@ -155,6 +155,9 @@
B.update()
..()
/datum/reagent/fermi/PEsmaller/hypo
name = "Modesty milk"
description = "A medicine used to treat organomegaly in a patient's breasts."
////////////////////////////////////////////////////////////////////////////////////////////////////
// PENIS ENLARGE
@@ -171,7 +174,7 @@
overdose_threshold = 12 //ODing makes you male and removes female genitals
metabolization_rate = 0.25
ImpureChem = "PEsmaller" //If you make an inpure chem, it stalls growth
InverseChemVal = 0.3
InverseChemVal = 0.35
InverseChem = "PEsmaller" //At really impure vols, it just becomes 100% inverse and shrinks instead.
/datum/reagent/fermi/penis_enlarger/on_mob_add(mob/living/carbon/M)
@@ -265,7 +268,7 @@
/datum/reagent/fermi/PEsmaller // Due to cozmo's request...!
name = "Incubus draft"
id = "PEsmaller"
description = "A volatile collodial mixture derived from various masculine solutions that encourages a larger gentleman's package via a potent testosterone mix, formula derived from a collaboration from Fermichem and Doctor Ronald Hyatt, who is well known for his phallus palace." //The toxic masculinity thing is a joke because I thought it would be funny to include it in the reagents, but I don't think many would find it funny? dumb
description = "A volatile collodial mixture derived from various masculine solutions that encourages a larger gentleman's package via a potent testosterone mix, formula derived from a collaboration from Fermichem and Doctor Ronald Hyatt, who is well known for his phallus palace."
color = "#888888" // This is greyish..?
taste_description = "chinese dragon powder"
metabolization_rate = 0.5
@@ -285,3 +288,7 @@
P.cached_length = P.cached_length - 0.1
P.update()
..()
/datum/reagent/fermi/PEsmaller/hypo
name = "Chastity draft"
description = "A medicine used to treat organomegaly in a patient's penis."
modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm
+1 -1
View File
@@ -184,7 +184,7 @@
//Writen by Trilby!! Embellsished a little by me.
/datum/reagent/fermi/nanite_b_gone
name = "Naninte bain"
name = "Naninte bane"
id = "nanite_b_gone"
description = "A stablised EMP that is highly volatile, shocking small nano machines that will kill them off at a rapid rate in a patient's system."
color = "#708f8f"
modular_citadel/code/modules/reagents/reagent container/hypovial.dm
+10
View File
@@ -146,6 +146,16 @@
icon_state = "hypovial"
comes_with = list("tricordrazine" = 30)
/obj/item/reagent_containers/glass/bottle/vial/small/preloaded/breastreduction
name = "pink hypovial (breast reduction)"
icon_state = "hypovial-p"
comes_with = list("BEsmaller" = 30)
/obj/item/reagent_containers/glass/bottle/vial/small/preloaded/penisreduction
name = "pink hypovial (penis reduction)"
icon_state = "hypovial-p"
comes_with = list("PEsmaller" = 30)
/obj/item/reagent_containers/glass/bottle/vial/large/preloaded/CMO
name = "deluxe hypovial"
icon_state = "hypoviallarge-cmos"