This commit is contained in:
Ghommie
2019-11-19 18:00:56 +01:00
parent a52e292cc8
commit dd101ef221
113 changed files with 519 additions and 552 deletions

View File

@@ -32,17 +32,17 @@
generate_actions()
/obj/vehicle/examine(mob/user)
..()
. = ..()
if(resistance_flags & ON_FIRE)
to_chat(user, "<span class='warning'>It's on fire!</span>")
. += "<span class='warning'>It's on fire!</span>"
var/healthpercent = obj_integrity/max_integrity * 100
switch(healthpercent)
if(50 to 99)
to_chat(user, "It looks slightly damaged.")
. += "It looks slightly damaged."
if(25 to 50)
to_chat(user, "It appears heavily damaged.")
. += "It appears heavily damaged."
if(0 to 25)
to_chat(user, "<span class='warning'>It's falling apart!</span>")
. += "<span class='warning'>It's falling apart!</span>"
/obj/vehicle/proc/is_key(obj/item/I)
return I? (key_type_exact? (I.type == key_type) : istype(I, key_type)) : FALSE

View File

@@ -29,9 +29,9 @@
icon_state = "upgrade"
/obj/vehicle/ridden/janicart/examine(mob/user)
..()
. = ..()
if(floorbuffer)
to_chat(user, "It has been upgraded with a floor buffer.")
. += "It has been upgraded with a floor buffer."
/obj/vehicle/ridden/janicart/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/storage/bag/trash))

View File

@@ -15,9 +15,9 @@
. = ..()
if(key_type)
if(!inserted_key)
to_chat(user, "<span class='notice'>Put a key inside it by clicking it with the key.</span>")
. += "<span class='notice'>Put a key inside it by clicking it with the key.</span>"
else
to_chat(user, "<span class='notice'>Alt-click [src] to remove the key.</span>")
. += "<span class='notice'>Alt-click [src] to remove the key.</span>"
/obj/vehicle/ridden/generate_action_type(actiontype)
var/datum/action/vehicle/ridden/A = ..()