Sleepy fixes

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
@@ -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
@@ -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