mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-12 07:33:34 +01:00
Progress Update
This commit is contained in:
@@ -8,7 +8,7 @@
|
||||
small = 1
|
||||
pass_flags = 1
|
||||
density = 0
|
||||
var/holder_type = /obj/item/weapon/holder/pai
|
||||
//var/holder_type = /obj/item/weapon/holder/pai
|
||||
|
||||
var/network = "SS13"
|
||||
var/obj/machinery/camera/current = null
|
||||
@@ -539,10 +539,10 @@
|
||||
pie << "You scoop up [src]."
|
||||
src << "[held] scoops you up."
|
||||
//pie.status_flags |= PASSEMOTES
|
||||
held.put_in_active_hand(pie)
|
||||
pie.icon_state = "pai-[icon_state]"
|
||||
held.put_in_active_hand(pie)
|
||||
pie.icon_override = 'icons/mob/head.dmi'
|
||||
pie.item_state = "pai-[icon_state]"
|
||||
pie.icon_override = 'icons/mob/in-hand/paiheld.dmi'
|
||||
return
|
||||
|
||||
..()
|
||||
@@ -565,11 +565,11 @@
|
||||
while(!istype(held, /mob/living))
|
||||
if(!held || !held.loc || count > 6)
|
||||
//For a runtime where M ends up in nullspace (similar to bluespace but less colourful)
|
||||
//src << "You are not being carried by anyone!"
|
||||
src << "You are not being carried by anyone!"
|
||||
return 0
|
||||
held = held.loc
|
||||
count++
|
||||
user << "held"
|
||||
user << "[held]"
|
||||
if(istype(held, /mob/living))
|
||||
data["holder"] = held
|
||||
data["health"] = "[held.stat > 1 ? "dead" : "[held.health]% healthy"]"
|
||||
@@ -577,7 +577,7 @@
|
||||
data["tox"] = "[held.getToxLoss() > 50 ? "<font color=#FF5555>" : "<font color=#55FF55>"][held.getToxLoss()]</font>"
|
||||
data["burn"] = "[held.getFireLoss() > 50 ? "<font color=#FF5555>" : "<font color=#55FF55>"][held.getFireLoss()]</font>"
|
||||
data["temp"] = "[held.bodytemperature-T0C]°C ([held.bodytemperature*1.8-459.67]°F)"
|
||||
data["infected"] = 0
|
||||
data["infected"] = null
|
||||
if (held.viruses)
|
||||
data["infected"] = 1
|
||||
var/virus[0]
|
||||
|
||||
Reference in New Issue
Block a user