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

Sleepy fixes

Browse Source
This commit is contained in:
Fermi
2019-05-19 04:20:34 +01:00
parent 8130a10d3a
commit 072a4ce6a6
5 changed files with 32 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/chemistry/holder.dm
+2 -2
View File
@@ -674,7 +674,7 @@ im
message_admins("calculating temperature factor, min: [C.OptimalTempMin], max: [C.OptimalTempMax], Exponential: [C.CurveSharpT], deltaT: [deltaT]")
stepChemAmmount = multiplier * deltaT
stepChemAmmount = deltaT //used to have multipler, now it doesn't
if (stepChemAmmount > C.RateUpLim)
stepChemAmmount = C.RateUpLim
else if (stepChemAmmount <= 0.01)
@@ -713,7 +713,7 @@ im
message_admins("Temp before change: [chem_temp], pH after change: [pH]")
//Apply pH changes and thermal output of reaction to beaker
//chem_temp = round(chem_temp + (C.ThermicConstant * stepChemAmmount)) //Why won't you update!!!
adjust_thermal_energy((C.ThermicConstant * stepChemAmmount), 0, 1500) //(J, min_temp = 2.7, max_temp = 1000)
adjust_thermal_energy((chem_temp*(C.ThermicConstant * stepChemAmmount *100)), 0, 1500) //(J, min_temp = 2.7, max_temp = 1000)
pH += (C.HIonRelease * stepChemAmmount)
message_admins("Temp after change: [chem_temp], pH after change: [pH]")
modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm
+2 -2
View File
@@ -1049,14 +1049,14 @@ And as stated earlier, this chem is hard to make, and is punishing on failure. Y
taste_description = "synthetic chocolate, a base tone of alcohol, and high notes of roses"
overdose_threshold = 100 //If this is too easy to get 100u of this, then double it please.
DoNotSplit = TRUE
//data = ("creatorID" = null, "creatorGender" = null, "creatorName" = null)
data = list("creatorID" = null, "creatorGender" = null, "creatorName" = null)
var/creatorID //ckey
var/creatorGender
var/creatorName
var/mob/living/creator
/datum/reagent/fermi/enthrall/FermiNew(var/atom/my_atom)
/datum/reagent/fermi/enthrall/nn_new(list/data)
message_admins("FermiNew for enthral proc'd")
creatorID = data.["creatorID"]
creatorGender = data.["creatorGender"]
modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm
+7 -6
View File
@@ -6,9 +6,9 @@
//Called when temperature is above a certain threshold
//....Is this too much?
/datum/chemical_reaction/fermi/proc/FermiExplode(src, datum/reagents/holder, volume, temp, pH, Reaction) //You can get holder by reagents.holder WHY DID I LEARN THIS NOW???
/datum/chemical_reaction/fermi/proc/FermiExplode(src, my_atom, volume, temp, pH, Reaction) //You can get holder by reagents.holder WHY DID I LEARN THIS NOW???
var/Svol = volume
var/turf/T = get_turf(holder.my_atom)
var/turf/T = get_turf(my_atom)
if(temp>600)//if hot, start a fire
switch(temp)
if (601 to 800)
@@ -68,6 +68,7 @@
var/location = get_turf(holder.my_atom)
var/datum/reagent/fermi/eigenstate/E = locate(/datum/reagent/fermi/eigenstate) in holder.reagent_list
E.location_created = location
//add on_new() handling of vars
//serum
/datum/chemical_reaction/fermi/SDGF
@@ -126,7 +127,7 @@
/datum/chemical_reaction/fermi/BElarger/FermiExplode(src, datum/reagents/holder, volume, temp, pH, Reaction)
//var/obj/item/organ/genital/breasts/B =
new /obj/item/organ/genital/breasts(holder.my_atom)
new /obj/item/organ/genital/breasts(holder.my_atom.loc)
var/list/seen = viewers(5, get_turf(holder.my_atom))
for(var/mob/M in seen)
to_chat(M, "<span class='warning'>The reaction suddenly condenses, creating a pair of breasts!</b></span>")//OwO
@@ -158,7 +159,7 @@
/datum/chemical_reaction/fermi/PElarger/FermiExplode(src, datum/reagents/holder, volume, temp, pH, Reaction)
//var/obj/item/organ/genital/penis/nP =
new /obj/item/organ/genital/penis(holder.my_atom)
new /obj/item/organ/genital/penis(holder.my_atom.loc)
var/list/seen = viewers(5, get_turf(holder.my_atom))
for(var/mob/M in seen)
to_chat(M, "<span class='warning'>The reaction suddenly condenses, creating a penis!</b></span>")//OwO
@@ -215,8 +216,8 @@
/datum/chemical_reaction/fermi/enthrall/on_reaction(var/atom/my_atom)
message_admins("On reaction for enthral proc'd")
var/datum/reagent/blood/B = locate(/datum/reagent/blood) in my_atom.reagents.reagent_list
var/datum/reagent/fermi/enthrall/E = locate(/datum/reagent/fermi/enthrall) in my_atom.reagents.reagent_list
var/datum/reagent/blood/B = locate(/datum/reagent/blood) in my_atom.reagent_list
var/datum/reagent/fermi/enthrall/E = locate(/datum/reagent/fermi/enthrall) in my_atom.reagent_list
if (B.data.["gender"] == "female")
E.data.["creatorGender"] = "Mistress"
else
modular_citadel/code/modules/reagents/objects/fermiclothes.dm
+1
View File
@@ -20,6 +20,7 @@
return ..()
/obj/item/clothing/head/hattip/speechModification(message)
..()
if(prob(0.01))
message += "\" and tips their hat. \"Spy's sappin' my Sentry!"
return message
modular_citadel/code/modules/reagents/objects/items.dm
+20 -19
View File
@@ -10,7 +10,6 @@
//set flammable somehow
/obj/item/pHbooklet/attack_hand(mob/user)
..()
if(user.get_held_index_of_item(src))
if(numberOfPages >= 1)
var/obj/item/pHpaper/P = new /obj/item/pHpaper
@@ -26,6 +25,7 @@
to_chat(user, "<span class='warning'>[src] is empty!</span>")
add_fingerprint(user)
return
..()
var/I = user.get_active_held_item()
if(!I)
user.put_in_active_hand(src)
@@ -43,41 +43,42 @@
w_class = WEIGHT_CLASS_TINY
//set flammable somehow
/obj/item/pHpaper/afterattack(obj/item/reagent_containers/glass/glass, mob/user, proximity)
if(!istype(glass))
/obj/item/pHpaper/afterattack(obj/item/reagent_containers/cont, mob/user, proximity)
if(!istype(cont))
return
if(used == TRUE)
to_chat(user, "<span class='warning'>[user] has already been used!</span>")
return
switch(glass.reagents.pH)
if(14 to INFINITY)
switch(cont.reagents.pH)
if(13.5 to INFINITY)
color = "#462c83"
if(13 to 14)
if(12.5 to 13.5)
color = "#63459b"
if(12 to 13)
if(11.5 to 12.5)
color = "#5a51a2"
if(11 to 12)
if(10.5 to 11.5)
color = "#3853a4"
if(10 to 11)
if(9.5 to 10.5)
color = "#3f93cf"
if(9 to 10)
if(8.5 to 9.5)
color = "#0bb9b7"
if(8 to 9)
if(7.5 to 8.5)
color = "#23b36e"
if(7 to 8)
if(6.5 to 7.5)
color = "#3aa651"
if(6 to 7)
if(5.5 to 6.5)
color = "#4cb849"
if(5 to 6)
if(4.5 to 5.5)
color = "#b5d335"
if(4 to 5)
if(3.5 to 4.5)
color = "#b5d333"
if(3 to 4)
if(2.5 to 3.5)
color = "#f7ec1e"
if(2 to 3)
if(1.5 to 2.5)
color = "#fbc314"
if(1 to 2)
if(0.5 to 1.5)
color = "#f26724"
if(-INFINITY to 1)
if(-INFINITY to 0.5)
color = "#ef1d26"
description += " The paper looks to be around [round(glass.reagents.pH)]"
used = TRUE