Fixes
This commit is contained in:
@@ -34,7 +34,7 @@
|
||||
if(current_cycle == 0)
|
||||
location_return = get_turf(M) //sets up return point
|
||||
to_chat(M, "<span class='userdanger'>You feel your wavefunction split!</span>")
|
||||
if(purity > 0.75) //Teleports you home if it's pure enough
|
||||
if(purity > 0.8 && location_created) //Teleports you home if it's pure enough
|
||||
log_game("FERMICHEM: [M] ckey: [M.key] returned to [location_created] using eigenstasium")
|
||||
var/turf/open/creation = location_created
|
||||
do_sparks(5,FALSE,M)
|
||||
|
||||
@@ -94,12 +94,12 @@
|
||||
/datum/reagent/fermi/hatmium/on_mob_life(mob/living/carbon/human/M)
|
||||
if(!M.head == /obj/item/clothing/head/hattip)
|
||||
return ..()
|
||||
var/hatArmor = (1+(current_cycle/30))*purity
|
||||
for(var/datum/armor/i in M.head)
|
||||
if(!overdosed)
|
||||
i = hatArmor
|
||||
else
|
||||
i = -hatArmor
|
||||
if(!overdosed)
|
||||
var/hatArmor = purity
|
||||
else
|
||||
var/hatArmor = - purity
|
||||
var/obj/item/W = M.head
|
||||
W.modifyAllRatings(hatArmor)
|
||||
..()
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
+11
-2
@@ -19,18 +19,27 @@
|
||||
user.emote("me",1,"admires such a spiffy hat.",TRUE)
|
||||
return ..()
|
||||
|
||||
/obj/item/clothing/head/foilhat/MouseDrop(atom/over_object)
|
||||
//You sure do love tipping your hat.
|
||||
if(usr)
|
||||
var/mob/living/carbon/C = usr
|
||||
if(src == C.head)
|
||||
C.emote("me",1,"tips their hat.",TRUE)
|
||||
return
|
||||
..()
|
||||
|
||||
/obj/item/clothing/head/hattip/speechModification(message, /mob/living/carbon/C)
|
||||
..()
|
||||
var/mob/living/carbon/C = get_wearer()//user
|
||||
var/obj/item/organ/tongue/T = C.getorganslot(ORGAN_SLOT_TONGUE)
|
||||
if (T.name == "fluffy tongue")
|
||||
if(prob(0.01))
|
||||
message += "\" and tips their hat. \"swpy's sappin' my swentwy uwu!!"
|
||||
message += "\" and tips their hat. \"swpy's sappin' my chem dispwencer uwu!!"
|
||||
return message
|
||||
message += "\" and tips their hat. \"[pick("weehaw!", "bwoy howdy.", "dawn tuutin'.", "weww don't that beat aww.", "whoooowee, wouwd ya wook at that!", "whoooowee! makin' bwacon!", "cweam gwavy!", "yippekeeyah-heeyapeeah-kwayoh!", "mwove 'em uut!", "gwiddy up!")]"
|
||||
return message
|
||||
if(prob(0.01))
|
||||
message += "\" and tips their hat. \"Spy's sappin' my Sentry!"
|
||||
message += "\" and tips their hat. \"Spy's sappin' my chem dispenser!"//How did I not think of this earlier
|
||||
message_admins("I really appreciate all the hard work you put into adminning citadel, I hope you're all having a good day and I hope this hidden and rare message admins brightens up your day.")
|
||||
return message
|
||||
message += "\" and tips their hat. \"[pick("Yeehaw!", "Boy howdy.", "Darn tootin'.", "Well don't that beat all.", "Whoooowee, would ya look at that!", "Whoooowee! Makin' bacon!", "Cream Gravy!", "Yippekeeyah-heeyapeeah-kayoh!", "Move 'em out!", "Giddy up!")]"
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
//A little janky with pockets
|
||||
/obj/item/FermiChem/pHbooklet/attack_hand(mob/user)
|
||||
if(user.get_held_index_of_item(src))
|
||||
if(user.get_held_index_of_item(src))//Does this check pockets too..?
|
||||
if(numberOfPages >= 1)
|
||||
var/obj/item/FermiChem/pHpaper/P = new /obj/item/FermiChem/pHpaper
|
||||
P.add_fingerprint(user)
|
||||
@@ -34,6 +34,28 @@
|
||||
if(!I)
|
||||
user.put_in_active_hand(src)
|
||||
|
||||
/obj/item/FermiChem/pHbooklet/MouseDrop(atom/over_object)
|
||||
if(user.get_held_index_of_item(src))
|
||||
user.put_in_active_hand(src)
|
||||
else
|
||||
if(numberOfPages >= 1)
|
||||
var/obj/item/FermiChem/pHpaper/P = new /obj/item/FermiChem/pHpaper
|
||||
P.add_fingerprint(user)
|
||||
P.forceMove(user.loc)
|
||||
user.put_in_active_hand(P)
|
||||
to_chat(user, "<span class='notice'>You take [P] out of \the [src].</span>")
|
||||
numberOfPages--
|
||||
playsound(user.loc, 'sound/items/poster_ripped.ogg', 50, 1)
|
||||
add_fingerprint(user)
|
||||
if(numberOfPages == 0)
|
||||
icon_state = "pHbookletEmpty"
|
||||
return
|
||||
else
|
||||
to_chat(user, "<span class='warning'>[src] is empty!</span>")
|
||||
add_fingerprint(user)
|
||||
return
|
||||
..()
|
||||
|
||||
/obj/item/FermiChem/pHpaper
|
||||
name = "pH indicator strip"
|
||||
desc = "A piece of paper that will change colour depending on the pH of a solution."
|
||||
@@ -51,7 +73,7 @@
|
||||
if(used == TRUE)
|
||||
to_chat(user, "<span class='warning'>[user] has already been used!</span>")
|
||||
return
|
||||
if(LAZYLEN(cont.reagents.reagent_list))
|
||||
if(!LAZYLEN(cont.reagents.reagent_list))
|
||||
return
|
||||
switch(round(cont.reagents.pH, 1))
|
||||
if(14 to INFINITY)
|
||||
|
||||
Reference in New Issue
Block a user