cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-23 04:51:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

no relative pathing (#16234)

Browse Source 
* the voices win in the end

* cleanup

* changelog

* secure.dm hates me

* make_exact_fit() in initialize instead of whatever was happening before
This commit is contained in:
harryob
2023-04-30 21:10:13 +00:00
committed by GitHub
parent ad29453d4a
commit 578bae6f6f
144 changed files with 9951 additions and 9675 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/organs/blood.dm
+1 -1
View File
@@ -176,7 +176,7 @@
vessel.add_reagent(/singleton/reagent/blood, amount, REAGENT_DATA(donor, /singleton/reagent/blood), temperature = species?.body_temperature)
..()
proc/blood_incompatible(donor,receiver,donor_species,receiver_species)
/proc/blood_incompatible(donor,receiver,donor_species,receiver_species)
if(!donor || !receiver) return 0
if(donor_species && receiver_species)
code/modules/organs/pain.dm
+2 -2
View File
@@ -3,8 +3,8 @@
animate(pain, alpha = target, time = 15, easing = ELASTIC_EASING)
animate(pain, alpha = 0, time = 20)
mob/var/last_pain_message = ""
mob/var/next_pain_time = 0
/mob/var/last_pain_message = ""
/mob/var/next_pain_time = 0
// message is the custom message to be displayed
// power decides how much painkillers will stop the message
code/modules/organs/subtypes/vaurca.dm
+1 -1
View File
@@ -69,7 +69,7 @@
parent_organ = BP_HEAD
robotic = ROBOTIC_MECHANICAL
obj/item/organ/vaurca/neuralsocket/process()
/obj/item/organ/vaurca/neuralsocket/process()
if (is_broken())
if (all_languages[LANGUAGE_VAURCA] in owner.languages)
owner.remove_language(LANGUAGE_VAURCA)
code/modules/organs/wound.dm
+3 -3
View File
@@ -288,7 +288,7 @@
max_bleeding_stage = 3
stages = list("big gaping wound" = 60, "healing gaping wound" = 40, "large blood soaked clot" = 25, "large angry scar" = 10, "large straight scar" = 0)
datum/wound/cut/massive
/datum/wound/cut/massive
max_bleeding_stage = 3
stages = list("massive wound" = 70, "massive healing wound" = 50, "massive blood soaked clot" = 25, "massive angry scar" = 10, "massive jagged scar" = 0)
@@ -317,7 +317,7 @@ datum/wound/cut/massive
max_bleeding_stage = 3
stages = list("big gaping hole" = 50, "healing gaping hole" = 20, "large blood soaked clot" = 15, "large angry scar" = 10, "large round scar" = 0)
datum/wound/puncture/massive
/datum/wound/puncture/massive
max_bleeding_stage = 3
stages = list("massive wound" = 60, "massive healing wound" = 30, "massive blood soaked clot" = 25, "massive angry scar" = 10, "massive jagged scar" = 0)
@@ -384,4 +384,4 @@ datum/wound/puncture/massive
..(damage_amt)
/datum/wound/lost_limb/can_merge(var/datum/wound/other)
return 0 //cannot be merged
return 0 //cannot be merged