Lotsa runtime fixes

This commit is contained in:
Archie
2021-06-08 01:06:46 -03:00
parent 11ea34aa6a
commit c05781a579
6 changed files with 19 additions and 11 deletions
+4 -4
View File
@@ -300,7 +300,7 @@
/datum/quirk/draconicspeaker/remove()
var/mob/living/M = quirk_holder
M.remove_language(/datum/language/draconic)
M?.remove_language(/datum/language/draconic)
/datum/quirk/slimespeaker
name = "Slime speaker"
@@ -316,7 +316,7 @@
/datum/quirk/slimespeaker/remove()
var/mob/living/M = quirk_holder
M.remove_language(/datum/language/slime)
M?.remove_language(/datum/language/slime)
/datum/quirk/tajaspeaker
name = "Siik-Tajr speaker"
@@ -332,7 +332,7 @@
/datum/quirk/tajaspeaker/remove()
var/mob/living/M = quirk_holder
M.remove_language(/datum/language/tajara)
M?.remove_language(/datum/language/tajara)
/datum/quirk/russianspeaker
name = "Neo-Russkiya speaker"
@@ -348,4 +348,4 @@
/datum/quirk/russianspeaker/remove()
var/mob/living/M = quirk_holder
M.remove_language(/datum/language/spacerussian)
M?.remove_language(/datum/language/spacerussian)
+5 -2
View File
@@ -429,8 +429,11 @@ GLOBAL_LIST_EMPTY(family_heirlooms)
/datum/quirk/mute/add()
var/mob/living/carbon/human/H = quirk_holder
mute = new
H.gain_trauma(mute, TRAUMA_RESILIENCE_SURGERY)
H.gain_trauma(TRAIT_MUTE, TRAUMA_RESILIENCE_SURGERY)
H.gain_trauma(mute, TRAUMA_RESILIENCE_ABSOLUTE)
/datum/quirk/mute/remove()
var/mob/living/carbon/human/H = quirk_holder
H?.cure_trauma_type(mute, TRAUMA_RESILIENCE_ABSOLUTE)
/datum/quirk/mute/on_process()
if(quirk_holder.mind && LAZYLEN(quirk_holder.mind.antag_datums))
+1 -1
View File
@@ -35,7 +35,7 @@
return
inuse = TRUE
flick("posialertflash",src)
visible_message("There are positronic personalities available!", runechat_popup = TRUE)
visible_message("There are positronic personalities available!")
radio.talk_into(src, "There are positronic personalities available!", science_channel)
playsound(loc, 'sound/machines/ping.ogg', 50)
addtimer(CALLBACK(src, .proc/liftcooldown), 300)
+1 -1
View File
@@ -116,7 +116,7 @@
var/datum/material/M = mat_id
var/amount = materials.materials[mat_id]
var/ref = REF(M)
output += "<span class=\"res_name\">[M.name]: </span>[amount] cm&sup3;"
output += "<span class=\"res_name\">[M]: </span>[amount] cm&sup3;"
if(amount >= MINERAL_MATERIAL_AMOUNT)
output += "<span style='font-size:80%;'>- Remove \[<a href='?src=[REF(src)];remove_mat=1;material=[ref]'>1</a>\]"
if(amount >= (MINERAL_MATERIAL_AMOUNT * 10))
@@ -12,6 +12,10 @@
battery = new battery_type(src)
..()
/obj/item/computer_hardware/battery/Destroy()
. = ..()
QDEL_NULL(battery)
/obj/item/computer_hardware/battery/try_insert(obj/item/I, mob/living/user = null)
if(!holder)
return FALSE
@@ -50,7 +54,6 @@
holder.shutdown_computer()
return TRUE
return FALSE
@@ -91,4 +94,4 @@
name = "nano battery"
desc = "A tiny power cell, commonly seen in low-end portable microcomputers."
icon_state = "cell_micro"
maxcharge = 300
maxcharge = 300
@@ -25,6 +25,7 @@
var/now_fixed
var/high_threshold_cleared
var/low_threshold_cleared
rad_flags = RAD_NO_CONTAMINATE
/obj/item/organ/proc/Insert(mob/living/carbon/M, special = 0, drop_if_replaced = TRUE)
if(!iscarbon(M) || owner == M)
@@ -134,7 +135,8 @@
///Damage decrements by a percent of its maxhealth
var/healing_amount = -(maxHealth * healing_factor)
///Damage decrements again by a percent of its maxhealth, up to a total of 4 extra times depending on the owner's health
healing_amount -= owner.satiety > 0 ? 4 * healing_factor * owner.satiety / MAX_SATIETY : 0
if(owner)
healing_amount -= owner.satiety > 0 ? 4 * healing_factor * owner.satiety / MAX_SATIETY : 0
applyOrganDamage(healing_amount) //to FERMI_TWEAK
//Make it so each threshold is stuck.