mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-08-30 16:48:12 +01:00
Merge pull request #8575 from Verkister/chonkers
Adds otieborgs and other fixes/tweaks
This commit is contained in:
@@ -39,6 +39,7 @@
|
||||
var/digest_brute = 2
|
||||
var/digest_burn = 3
|
||||
var/recycles = FALSE
|
||||
var/medsensor = TRUE //Does belly sprite come with patient ok/dead light?
|
||||
|
||||
/obj/item/device/dogborg/sleeper/New()
|
||||
..()
|
||||
@@ -426,21 +427,25 @@
|
||||
|
||||
//Well, we HAD one, what happened to them?
|
||||
if(patient in contents)
|
||||
if(patient_laststat != patient.stat)
|
||||
if(cleaning)
|
||||
hound.sleeper_r = TRUE
|
||||
hound.sleeper_g = FALSE
|
||||
patient_laststat = patient.stat
|
||||
else if(patient.stat & DEAD)
|
||||
hound.sleeper_r = TRUE
|
||||
hound.sleeper_g = FALSE
|
||||
patient_laststat = patient.stat
|
||||
else
|
||||
hound.sleeper_r = FALSE
|
||||
hound.sleeper_g = TRUE
|
||||
patient_laststat = patient.stat
|
||||
//Update icon
|
||||
hound.updateicon()
|
||||
if(medsensor)
|
||||
if(patient_laststat != patient.stat)
|
||||
if(cleaning)
|
||||
hound.sleeper_r = TRUE
|
||||
hound.sleeper_g = FALSE
|
||||
patient_laststat = patient.stat
|
||||
else if(patient.stat & DEAD)
|
||||
hound.sleeper_r = TRUE
|
||||
hound.sleeper_g = FALSE
|
||||
patient_laststat = patient.stat
|
||||
else
|
||||
hound.sleeper_r = FALSE
|
||||
hound.sleeper_g = TRUE
|
||||
patient_laststat = patient.stat
|
||||
else
|
||||
hound.sleeper_r = TRUE
|
||||
patient_laststat = patient.stat
|
||||
//Update icon
|
||||
hound.updateicon()
|
||||
//Return original patient
|
||||
return(patient)
|
||||
|
||||
@@ -448,17 +453,21 @@
|
||||
else
|
||||
for(var/mob/living/carbon/human/C in contents)
|
||||
patient = C
|
||||
if(cleaning)
|
||||
hound.sleeper_r = TRUE
|
||||
hound.sleeper_g = FALSE
|
||||
patient_laststat = patient.stat
|
||||
else if(patient.stat & DEAD)
|
||||
hound.sleeper_r = TRUE
|
||||
hound.sleeper_g = FALSE
|
||||
patient_laststat = patient.stat
|
||||
if(medsensor)
|
||||
if(cleaning)
|
||||
hound.sleeper_r = TRUE
|
||||
hound.sleeper_g = FALSE
|
||||
patient_laststat = patient.stat
|
||||
else if(patient.stat & DEAD)
|
||||
hound.sleeper_r = TRUE
|
||||
hound.sleeper_g = FALSE
|
||||
patient_laststat = patient.stat
|
||||
else
|
||||
hound.sleeper_r = FALSE
|
||||
hound.sleeper_g = TRUE
|
||||
patient_laststat = patient.stat
|
||||
else
|
||||
hound.sleeper_r = FALSE
|
||||
hound.sleeper_g = TRUE
|
||||
hound.sleeper_r = TRUE
|
||||
patient_laststat = patient.stat
|
||||
//Update icon and return new patient
|
||||
hound.updateicon()
|
||||
@@ -659,6 +668,7 @@
|
||||
desc = "Equipment for a K9 unit. A mounted portable-brig that holds criminals."
|
||||
icon_state = "sleeperb"
|
||||
injection_chems = null //So they don't have all the same chems as the medihound!
|
||||
medsensor = FALSE
|
||||
|
||||
/obj/item/device/dogborg/sleeper/compactor //Janihound gut.
|
||||
name = "Garbage Processor"
|
||||
@@ -668,6 +678,7 @@
|
||||
compactor = TRUE
|
||||
recycles = TRUE
|
||||
max_item_count = 25
|
||||
medsensor = FALSE
|
||||
|
||||
/obj/item/device/dogborg/sleeper/compactor/analyzer //sci-borg gut.
|
||||
name = "Digestive Analyzer"
|
||||
|
||||
@@ -165,7 +165,8 @@
|
||||
"K9 hound" = "k9",
|
||||
"K9 Alternative" = "k92",
|
||||
"Secborg model V-2" = "secborg",
|
||||
"Borgi" = "borgi-sec"
|
||||
"Borgi" = "borgi-sec",
|
||||
"Otieborg" = "oties"
|
||||
)
|
||||
channels = list("Security" = 1)
|
||||
networks = list(NETWORK_SECURITY)
|
||||
@@ -256,7 +257,7 @@
|
||||
|
||||
var/datum/matter_synth/medicine = new /datum/matter_synth/medicine(2000)
|
||||
synths += medicine
|
||||
|
||||
|
||||
var/obj/item/stack/medical/advanced/clotting/C = new (src)
|
||||
C.uses_charge = 1
|
||||
C.charge_costs = list(1000)
|
||||
@@ -349,7 +350,8 @@
|
||||
name = "Custodial Hound module"
|
||||
sprites = list(
|
||||
"Custodial Hound" = "scrubpup",
|
||||
"Borgi" = "borgi-jani"
|
||||
"Borgi" = "borgi-jani",
|
||||
"Otieborg" = "otiej"
|
||||
)
|
||||
channels = list("Service" = 1)
|
||||
pto_type = PTO_CIVILIAN
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 1.1 MiB After Width: | Height: | Size: 1.2 MiB |
Reference in New Issue
Block a user