cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 12:37:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Second wave

Browse Source
This commit is contained in:
DGamerL
2024-07-06 02:07:24 +02:00
parent eabfc41287
commit 0240954b17
9 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/dna/mutations/mutation_powers.dm
+1 -1
View File
@@ -509,7 +509,7 @@
if(user.restrained())//Why being pulled while cuffed prevents you from moving
for(var/mob/living/M in range(user, 1))
if(M.pulling == user)
if(!M.restrained() && M.stat == 0 && !(M.mobility_flags & MOBILITY_STAND) && user.Adjacent(M))
if(!M.restrained() && M.stat == CONSCIOUS && !(M.mobility_flags & MOBILITY_STAND) && user.Adjacent(M))
failure = TRUE
else
M.stop_pulling()
code/game/gamemodes/wizard/soulstone.dm
+1 -1
View File
@@ -317,7 +317,7 @@
if("VICTIM")
var/mob/living/carbon/human/T = target
if(T.stat == 0)
if(T.stat == CONSCIOUS)
to_chat(user, "<span class='danger'>Capture failed!</span> Kill or maim the victim first!")
else
if(!length(T.client_mobs_in_contents))
code/game/mecha/equipment/tools/medical_tools.dm
+2 -2
View File
@@ -105,7 +105,7 @@
if(output)
var/temp = ""
if(patient)
temp = "<br />\[Occupant: [patient] ([patient.stat > 1 ? "*DECEASED*" : "Health: [patient.health]%"])\]<br /><a href='byond://?src=[UID()];view_stats=1'>View stats</a>|<a href='byond://?src=[UID()];eject=1'>Eject</a>"
temp = "<br />\[Occupant: [patient] ([patient.stat == DEAD ? "*DECEASED*" : "Health: [patient.health]%"])\]<br /><a href='byond://?src=[UID()];view_stats=1'>View stats</a>|<a href='byond://?src=[UID()];eject=1'>Eject</a>"
return "[output] [temp]"
/obj/item/mecha_parts/mecha_equipment/medical/sleeper/Topic(href,href_list)
@@ -161,7 +161,7 @@
t1 = "*dead*"
else
t1 = "Unknown"
return {"<font color="[patient.health > 50 ? "blue" : "red"]"><b>Health:</b> [patient.stat > 1 ? "[t1]" : "[patient.health]% ([t1])"]</font><br />
return {"<font color="[patient.health > 50 ? "blue" : "red"]"><b>Health:</b> [patient.stat == DEAD ? "[t1]" : "[patient.health]% ([t1])"]</font><br />
<font color="[patient.bodytemperature > 50 ? "blue" : "red"]"><b>Core Temperature:</b> [patient.bodytemperature-T0C]&deg;C ([patient.bodytemperature*1.8-459.67]&deg;F)</font><br />
<font color="[patient.getBruteLoss() < 60 ? "blue" : "red"]"><b>Brute Damage:</b> [patient.getBruteLoss()]%</font><br />
<font color="[patient.getOxyLoss() < 60 ? "blue" : "red"]"><b>Respiratory Damage:</b> [patient.getOxyLoss()]%</font><br />
code/game/mecha/mecha_topic.dm
+1 -1
View File
@@ -250,7 +250,7 @@
return
if(href_list["close"])
return
if(usr.stat > 0)
if(usr.stat != CONSCIOUS)
return
var/datum/topic_input/afilter = new /datum/topic_input(href,href_list)
if(href_list["select_equip"])
code/game/objects/items/devices/scanners.dm
+3 -3
View File
@@ -429,7 +429,7 @@ SLIME SCANNER
if("robot")
var/burn = M.getFireLoss() > 50 ? "<b>[M.getFireLoss()]</b>" : M.getFireLoss()
var/brute = M.getBruteLoss() > 50 ? "<b>[M.getBruteLoss()]</b>" : M.getBruteLoss()
msgs += "<span class='notice'>Analyzing Results for [M]:\n\t Overall Status: [M.stat > 1 ? "fully disabled" : "[M.health]% functional"]</span>"
msgs += "<span class='notice'>Analyzing Results for [M]:\n\t Overall Status: [M.stat == DEAD ? "fully disabled" : "[M.health]% functional"]</span>"
msgs += "\t Key: <font color='#FFA500'>Electronics</font>/<font color='red'>Brute</font>"
msgs += "\t Damage Specifics: <font color='#FFA500'>[burn]</font> - <font color='red'>[brute]</font>"
if(M.timeofdeath && M.stat == DEAD)
@@ -460,7 +460,7 @@ SLIME SCANNER
if("prosthetics")
var/mob/living/carbon/human/H = M
var/is_ipc = ismachineperson(H)
msgs += "<span class='notice'>Analyzing Results for [M]: [is_ipc ? "\n\t Overall Status: [H.stat > 1 ? "fully disabled" : "[H.health]% functional"]</span><hr>" : "<hr>"]" //for the record im sorry
msgs += "<span class='notice'>Analyzing Results for [M]: [is_ipc ? "\n\t Overall Status: [H.stat == DEAD ? "fully disabled" : "[H.health]% functional"]</span><hr>" : "<hr>"]" //for the record im sorry
msgs += "\t Key: <font color='#FFA500'>Electronics</font>/<font color='red'>Brute</font>"
msgs += "<span class='notice'>External prosthetics:</span>"
var/organ_found
@@ -502,7 +502,7 @@ SLIME SCANNER
var/mob/living/silicon/ai/A = M
var/burn = A.getFireLoss() > 50 ? "<b>[A.getFireLoss()]</b>" : A.getFireLoss()
var/brute = A.getBruteLoss() > 50 ? "<b>[A.getBruteLoss()]</b>" : A.getBruteLoss()
msgs += "<span class='notice'>Analyzing Results for [M]:\n\t Overall Status: [A.stat > 1 ? "fully disabled" : "[A.health]% functional"]</span>"
msgs += "<span class='notice'>Analyzing Results for [M]:\n\t Overall Status: [A.stat == DEAD ? "fully disabled" : "[A.health]% functional"]</span>"
msgs += "\t Key: <font color='#FFA500'>Electronics</font>/<font color='red'>Brute</font>"
msgs += "\t Damage Specifics: <font color='#FFA500'>[burn]</font> - <font color='red'>[brute]</font>"
code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm
+1 -1
View File
@@ -99,7 +99,7 @@ GLOBAL_LIST_EMPTY(monkey_recyclers)
if(ishuman(grabbed))
var/mob/living/carbon/human/target = grabbed
if(issmall(target))
if(target.stat == 0)
if(target.stat == CONSCIOUS)
to_chat(user, "<span class='warning'>The monkey is struggling far too much to put it in the recycler.</span>")
else
user.drop_item()
code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_ai.dm
+1 -1
View File
@@ -77,7 +77,7 @@
/mob/living/simple_animal/hostile/poison/terror_spider/LoseTarget()
if(target && isliving(target))
var/mob/living/T = target
if(T.stat > 0)
if(T.stat != CONSCIOUS)
killcount++
regen_points += regen_points_per_kill
attackstep = 0
code/modules/paperwork/faxmachine.dm
+1 -1
View File
@@ -207,7 +207,7 @@ GLOBAL_LIST_EMPTY(fax_blacklist)
var/n_name = tgui_input_text(usr, "What would you like to label the fax?", "Fax Labelling", copyitem.name)
if(!n_name)
return
if(copyitem && copyitem.loc == src && usr.stat == 0)
if(copyitem && copyitem.loc == src && usr.stat == CONSCIOUS)
if(istype(copyitem, /obj/item/paper))
copyitem.name = "[(n_name ? "[n_name]" : initial(copyitem.name))]"
copyitem.desc = "This is a paper titled '" + copyitem.name + "'."
code/modules/paperwork/photography.dm
+1 -1
View File
@@ -45,7 +45,7 @@
if(!txt)
return
txt = copytext(txt, 1, 128)
if(loc == user && user.stat == 0)
if(loc == user && user.stat == CONSCIOUS)
scribble = txt
else if(P.get_heat())
burnphoto(P, user)