From 3928e027b42eb1061aee4366094f9fdfb198b42c Mon Sep 17 00:00:00 2001 From: Fermi Date: Tue, 25 Jun 2019 23:06:55 +0100 Subject: [PATCH] Fixes (see dev discussion) --- code/__HELPERS/global_lists.dm | 2 +- code/modules/reagents/chemistry/holder.dm | 3 ++- code/modules/reagents/reagent_containers.dm | 15 +++++++++++---- .../reagents/reagent_containers/glass.dm | 8 ++++++++ .../code/game/machinery/vending.dm | 5 +++-- .../game/objects/items/storage/firstaid.dm | 16 ++++++++++++++++ .../code/modules/arousal/organs/penis.dm | 2 +- .../chemistry/reagents/enlargement.dm | 13 ++++++++++--- .../chemistry/reagents/fermi_reagents.dm | 2 +- .../reagents/reagent container/hypovial.dm | 10 ++++++++++ modular_citadel/icons/firstaid.dmi | Bin 2952 -> 3051 bytes modular_citadel/icons/obj/vial.dmi | Bin 2574 -> 2622 bytes 12 files changed, 63 insertions(+), 13 deletions(-) diff --git a/code/__HELPERS/global_lists.dm b/code/__HELPERS/global_lists.dm index 93f2856544..6f1e9c25a3 100644 --- a/code/__HELPERS/global_lists.dm +++ b/code/__HELPERS/global_lists.dm @@ -52,7 +52,7 @@ init_sprite_accessory_subtypes(/datum/sprite_accessory/vagina, GLOB.vagina_shapes_list) init_sprite_accessory_subtypes(/datum/sprite_accessory/breasts, GLOB.breasts_shapes_list) - GLOB.breasts_size_list = list ("a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "huge", "flat") //We need the list to choose from initialized, but it's no longer a sprite_accessory thing. + GLOB.breasts_size_list = list ("a", "b", "c", "d", "e") //We need the list to choose from initialized, but it's no longer a sprite_accessory thing. GLOB.gentlemans_organ_names = list("phallus", "willy", "dick", "prick", "member", "tool", "gentleman's organ", "cock", "wang", "knob", "dong", "joystick", "pecker", "johnson", "weenie", "tadger", "schlong", "thirsty ferret", "baloney pony", "schlanger") for(var/K in GLOB.breasts_shapes_list) var/datum/sprite_accessory/breasts/value = GLOB.breasts_shapes_list[K] diff --git a/code/modules/reagents/chemistry/holder.dm b/code/modules/reagents/chemistry/holder.dm index baa31d0f56..27df783781 100644 --- a/code/modules/reagents/chemistry/holder.dm +++ b/code/modules/reagents/chemistry/holder.dm @@ -931,7 +931,8 @@ pH = 7 //In practice this is really confusing and players feel like it randomly melts their beakers, but I'm not sure how else to handle it. We'll see how it goes and I can remove this if it confuses people. else - pH = (((pH - R.pH) / total_volume) * amount) + pH + if (((pH > R.pH) && (pH <= 7)) || ((pH < R.pH) && (pH >= 7))) + pH = (((pH - R.pH) / total_volume) * amount) + pH if(istype(my_atom, /obj/item/reagent_containers/)) var/obj/item/reagent_containers/RC = my_atom RC.pH_check()//checks beaker resilience) diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm index bd1f024367..52c40c2ae5 100644 --- a/code/modules/reagents/reagent_containers.dm +++ b/code/modules/reagents/reagent_containers.dm @@ -16,6 +16,7 @@ var/disease_amount = 20 var/spillable = FALSE var/beaker_weakness_bitflag = NONE//Bitflag! + var/container_HP = 2 /obj/item/reagent_containers/Initialize(mapload, vol) . = ..() @@ -160,7 +161,13 @@ if((reagents.pH < 0.5) || (reagents.pH > 13.5)) var/list/seen = viewers(5, get_turf(src)) var/iconhtml = icon2html(src, seen) - for(var/mob/M in seen) - to_chat(M, "[iconhtml] \The [src]'s melts from the extreme pH!") - playsound(get_turf(src), 'sound/FermiChem/acidmelt.ogg', 80, 1) - qdel(src) + container_HP-- + if(container_HP <= 0) + for(var/mob/M in seen) + to_chat(M, "[iconhtml] \The [src]'s melts from the extreme pH!") + playsound(get_turf(src), 'sound/FermiChem/acidmelt.ogg', 80, 1) + qdel(src) + else + for(var/mob/M in seen) + to_chat(M, "[iconhtml] \The [src]'s is damaged by the extreme pH and begins to deform!") + playsound(get_turf(src), 'sound/FermiChem/bufferadd.ogg', 50, 1) diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm index 3cb9b447dc..3efd17b29b 100644 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -6,6 +6,7 @@ reagent_flags = OPENCONTAINER spillable = TRUE resistance_flags = ACID_PROOF + container_HP = 2 /obj/item/reagent_containers/glass/attack(mob/M, mob/user, obj/target) @@ -114,6 +115,7 @@ item_state = "beaker" materials = list(MAT_GLASS=500) beaker_weakness_bitflag = PH_WEAK + container_HP = 3 /obj/item/reagent_containers/glass/beaker/Initialize() . = ..() @@ -165,6 +167,7 @@ volume = 100 amount_per_transfer_from_this = 10 possible_transfer_amounts = list(5,10,15,20,25,30,50,100) + container_HP = 4 /obj/item/reagent_containers/glass/beaker/plastic name = "x-large beaker" @@ -207,6 +210,7 @@ reagent_flags = OPENCONTAINER | NO_REACT volume = 50 amount_per_transfer_from_this = 10 + container_HP = 10//shouldn't be needed /obj/item/reagent_containers/glass/beaker/noreact/Initialize() beaker_weakness_bitflag &= ~PH_WEAK @@ -223,6 +227,7 @@ volume = 300 amount_per_transfer_from_this = 10 possible_transfer_amounts = list(5,10,15,20,25,30,50,100,300) + container_HP = 5 /obj/item/reagent_containers/glass/beaker/cryoxadone list_reagents = list("cryoxadone" = 30) @@ -279,6 +284,7 @@ SLOT_L_STORE, SLOT_R_STORE,\ SLOT_GENERC_DEXTROUS_STORAGE ) + container_HP = 2 /obj/item/reagent_containers/glass/bucket/Initialize() beaker_weakness_bitflag |= TEMP_WEAK @@ -332,6 +338,7 @@ materials = list(MAT_GLASS=0) volume = 50 amount_per_transfer_from_this = 10 + container_HP = 1 /obj/item/reagent_containers/glass/beaker/waterbottle/Initialize() beaker_weakness_bitflag |= TEMP_WEAK @@ -347,6 +354,7 @@ list_reagents = list("water" = 100) volume = 100 amount_per_transfer_from_this = 20 + container_HP = 1 /obj/item/reagent_containers/glass/beaker/waterbottle/large/empty list_reagents = list() diff --git a/modular_citadel/code/game/machinery/vending.dm b/modular_citadel/code/game/machinery/vending.dm index bdca91b0e6..c13a77cbed 100755 --- a/modular_citadel/code/game/machinery/vending.dm +++ b/modular_citadel/code/game/machinery/vending.dm @@ -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 diff --git a/modular_citadel/code/game/objects/items/storage/firstaid.dm b/modular_citadel/code/game/objects/items/storage/firstaid.dm index 6ff1bfbe2c..0fab7e04d9 100755 --- a/modular_citadel/code/game/objects/items/storage/firstaid.dm +++ b/modular_citadel/code/game/objects/items/storage/firstaid.dm @@ -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" diff --git a/modular_citadel/code/modules/arousal/organs/penis.dm b/modular_citadel/code/modules/arousal/organs/penis.dm index 59acb9f42d..6d5342dbee 100644 --- a/modular_citadel/code/modules/arousal/organs/penis.dm +++ b/modular_citadel/code/modules/arousal/organs/penis.dm @@ -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() diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/enlargement.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/enlargement.dm index ce39d26a6b..52aef76be0 100644 --- a/modular_citadel/code/modules/reagents/chemistry/reagents/enlargement.dm +++ b/modular_citadel/code/modules/reagents/chemistry/reagents/enlargement.dm @@ -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." diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm index 743055b279..fa1c2f714b 100644 --- a/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm +++ b/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm @@ -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" diff --git a/modular_citadel/code/modules/reagents/reagent container/hypovial.dm b/modular_citadel/code/modules/reagents/reagent container/hypovial.dm index a58a7fc825..82cfb08e68 100755 --- a/modular_citadel/code/modules/reagents/reagent container/hypovial.dm +++ b/modular_citadel/code/modules/reagents/reagent container/hypovial.dm @@ -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" diff --git a/modular_citadel/icons/firstaid.dmi b/modular_citadel/icons/firstaid.dmi index 693f5a2fa4a3b1994a95408b80a642684d28dfe5..1e000e000f9daa2f61d945cf144e39773c0a4235 100644 GIT binary patch delta 2875 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 aFRTvAltb@(k|}t)f~-#3S^Ra}8~-mt9%`ik diff --git a/modular_citadel/icons/obj/vial.dmi b/modular_citadel/icons/obj/vial.dmi index bc282ab1d3df0d243d034f54c0abcc4a5c7013e7..38402d4ad0e6dc7c20d05135d73b6f5fe2568959 100755 GIT binary patch literal 2622 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 delta 2316 zcmX|?2T;@56UUQ)lmLPxh(|w8Mefi9>4zjJC`f3E6j5RjrAZM%f>M4#QRFZbBRzl( za#9kpgepW35ELW56Ph%EP=kSx{DU|1e=~1(X7}yRyxH$(w-%lRPca74I?AB+NV%qE zlUx5-xTewnv_JnsQ*}+%KCii!dVBr$f{^7y$3^1|>LYZbhj_!4^{Qd>nKsKCrKGJ$RaD5P8T`Qh7!q$%c*C(wOCZFKdC%9lO}c#C2;_u8_U5OempEj`gh@ojwddSK367! zy`u()EMVTsmR1GfIY%e>f`&!*R_tXTtz34=San^<0>9bF$VgoCrBV$FtcfTC?N^dA zfA)Vv8kLX$27-5DM*IzyV15W#@(tcX0DM@?#?~JwO0y^UlR*P=FJ53qYOxISW&ukQ z?Dt#rch%d=TKT&+HV< zy};J`ScobFaok^B3zX0VN%1v^mi&m3bF6&U{9NSP=Su7La7J5*e-&tdMwU_OPND4u z%q)t0BZ_RHK%g-u({NVES9CH)F}T_!DY^KB<6$Mi78+WROic2K>7EU71IZKFkW^AC z!=^VHZo+`?Hu)h*b|@|4MxMrqnV!c`=Zp)Vn-BU9JKg>?}=Pgzc(vT4TUd z$kh~tpvfBi^qKf;^Ob#28fO3%m`^7%bBC2U*uEtflxA?{h<~7r5xUN`PM)JHoA#!uYf~ncm#a~4)VRU7v@p&g59|LBh z$GS7?a?Q}lnH;6Q!KPcpSq7=CIh9JKhPBg+Cn}CGJ}QfiUh_En@1{M*1vxK65qe`18)R~sOre4(c2&K&MdG5gFTbO9n&=S7Aw3&6(5tvCjWp) z1G&eSMfdd_1Jk{ojFDh(Cq`zi-2N zIH8X$L;&A&uEHG%M52sqvq_g|rty+BEX)B^ve!&bB+P*z!p$ZsrML8&fqN3m!83WF zM(p1`Gjql@XrYGiu_Ts_BM|YKR2s1bd9P-5DNOs?g94!)5xQyzIv;L>jFXXoUYJf!W}S?KFNzwMY2>W zxp@h(p7c<^hWIpLslWU7bZtUagg$BYjym#P&dwV|?3Wrpk9}35fOOBj-$8_K@#wk) zgVn1+F`!N~GK00- z)Mrs=7^a4%6vE_?**mV$Dd@jTiYdo(!XEDsP&#!a)+Xa5y24>wepcqGgQAum=ISa- zAE=icwJ6}aVu3*2AQI3hp+(iU6IVJh)<`=TmKv zO$9IffuLw}ntdtoHIq%uK%DxoLTKNDQ*NC>q*6Ex=PpHw)qTfpxa5N~0^c{VC6xBV z1GE?c(0xv(V7j}JrzzMySDon$uBqAcagk^eaH#I|eRR0;kMJ$fOeP3MkIZ@E1;KTD z`$&J&1qZBpjLICf)~}Vad{#zkmw?N44+Y&X#Em-{(hfZg0(9~1OPD;sR8#K4JwzjJq!<(1I zIy*aUR@vx?xYi9Te|oK%1KU}wo0}V zmsS@OV$+kA^woU1cVYglId_xSUl1$A;D!E{t(DK{N5^x1bZC+k(%mzfbLQ}m&d6#M zFjy8o^fHr{{tK_$1p6!DgmD@_^Zq*5E2OxOu2@ z_5Pc-gqzjTpfFpIDMIzyxojC84;r