cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-11 10:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

optimizations, unnecessary crap, undocumented ipc change

Browse Source
This commit is contained in:
kevinz000
2020-01-24 21:18:19 -07:00
parent 9181a4aee0
commit 24cbe67f27
5 changed files with 6 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/__DEFINES/components.dm
View File

@@ -275,8 +275,6 @@
#define COMSIG_TURF_MAKE_DRY "make_turf_try" //(max_strength, immediate, duration_decrease = INFINITY): Returns bool. #define COMSIG_TURF_MAKE_DRY "make_turf_try" //(max_strength, immediate, duration_decrease = INFINITY): Returns bool.
#define COMSIG_COMPONENT_CLEAN_ACT "clean_act" //called on an object to clean it of cleanables. Usualy with soap: (num/strength) #define COMSIG_COMPONENT_CLEAN_ACT "clean_act" //called on an object to clean it of cleanables. Usualy with soap: (num/strength)
//Blood color
#define COMSIG_BLOOD_COLOR "blood_DNA_to_color" //RGB blood stuff
//Food //Food
#define COMSIG_FOOD_EATEN "food_eaten" //from base of obj/item/reagent_containers/food/snacks/attack(): (mob/living/eater, mob/feeder) #define COMSIG_FOOD_EATEN "food_eaten" //from base of obj/item/reagent_containers/food/snacks/attack(): (mob/living/eater, mob/feeder)

12
code/_globalvars/lists/mobs.dm
View File

@@ -91,13 +91,7 @@ GLOBAL_LIST_INIT(all_types_bloods,list(
"BUG" "BUG"
)) ))
GLOBAL_LIST_INIT(blood_types, list( GLOBAL_LIST_INIT(blood_reagent_types, list(
"blood", /datum/reagent/blood,
"jellyblood" /datum/reagent/blood/jellyblood
)) ))
GLOBAL_LIST_INIT(blood_id_types, list(
"blood" = /datum/reagent/blood,
"jellyblood" = /datum/reagent/blood/jellyblood
))

5
code/game/atoms.dm
View File

@@ -505,9 +505,8 @@
return final_rgb return final_rgb
/atom/proc/clean_blood() /atom/proc/clean_blood()
if(islist(blood_DNA)) . = blood_DNA? TRUE : FALSE
blood_DNA = null blood_dna = null
return TRUE
/atom/proc/wash_cream() /atom/proc/wash_cream()
return TRUE return TRUE

2
code/game/machinery/suit_storage_unit.dm
View File

@@ -266,7 +266,7 @@
for(var/atom/movable/AM in things_to_clear) //Scorches away blood and forensic evidence, although the SSU itself is unaffected for(var/atom/movable/AM in things_to_clear) //Scorches away blood and forensic evidence, although the SSU itself is unaffected
SEND_SIGNAL(AM, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRONG) SEND_SIGNAL(AM, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRONG)
AM.clean_blood() AM.clean_blood()
AM.fingerprints = list() AM.fingerprints = null
var/datum/component/radioactive/contamination = AM.GetComponent(/datum/component/radioactive) var/datum/component/radioactive/contamination = AM.GetComponent(/datum/component/radioactive)
if(contamination) if(contamination)
qdel(contamination) qdel(contamination)

9
code/modules/surgery/organs/heart.dm
View File

@@ -220,21 +220,12 @@ obj/item/organ/heart/cybernetic/upgraded/on_life()
addtimer(VARSET_CALLBACK(src, dose_available, TRUE), 5 MINUTES) addtimer(VARSET_CALLBACK(src, dose_available, TRUE), 5 MINUTES)
ramount = 0 ramount = 0
/obj/item/organ/heart/ipc /obj/item/organ/heart/ipc
name = "IPC heart" name = "IPC heart"
desc = "An electronic pump that regulates hydraulic functions, they have an auto-restart after EMPs." desc = "An electronic pump that regulates hydraulic functions, they have an auto-restart after EMPs."
icon_state = "heart-c" icon_state = "heart-c"
organ_flags = ORGAN_SYNTHETIC organ_flags = ORGAN_SYNTHETIC
/obj/item/organ/heart/ipc/emp_act()
. = ..()
if(. & EMP_PROTECT_SELF)
return
Stop()
addtimer(CALLBACK(src, .proc/Restart), 10)
/obj/item/organ/heart/freedom /obj/item/organ/heart/freedom
name = "heart of freedom" name = "heart of freedom"
desc = "This heart pumps with the passion to give... something freedom." desc = "This heart pumps with the passion to give... something freedom."