mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 10:12:45 +00:00
[MIRROR] misc fixes (#11926)
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
committed by
GitHub
parent
d6afe6f558
commit
7cc9366073
@@ -262,13 +262,15 @@
|
||||
var/showpilot_lift = 5
|
||||
|
||||
/obj/item/kit/paint/ripley/customize(obj/mecha/M, mob/user)
|
||||
if(!istype(M)) //Kicks it back and gives proper error text.
|
||||
return ..()
|
||||
if(showpilot)
|
||||
M.show_pilot = TRUE
|
||||
M.pilot_lift = 5
|
||||
else
|
||||
M.show_pilot = FALSE
|
||||
M.pilot_lift = 0
|
||||
. = ..()
|
||||
. = ..() //Has to be done AFTER show_pilot being set in order to update the icon properly.
|
||||
|
||||
/obj/item/kit/paint/ripley/death
|
||||
name = "\"Reaper\" APLU customisation kit"
|
||||
|
||||
@@ -171,9 +171,12 @@
|
||||
var/tforce = 0
|
||||
if(ismob(source))
|
||||
tforce = 40
|
||||
else if(isobj(source))
|
||||
else if(isitem(source))
|
||||
var/obj/item/I = source
|
||||
tforce = I.throwforce
|
||||
else if(isobj(source))
|
||||
var/obj/hitting_object = source
|
||||
tforce = hitting_object.w_class * 5
|
||||
if(reinf) tforce *= 0.25
|
||||
if(health - tforce <= 7 && !reinf)
|
||||
anchored = FALSE
|
||||
|
||||
Reference in New Issue
Block a user