cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-10 09:42:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

edits

Browse Source
This commit is contained in:
lessthanthree
2024-12-02 15:13:38 -08:00
parent dffa751596
commit 650476c456
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/__DEFINES/traits/declarations.dm
View File

@@ -278,6 +278,9 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
/// Applied into wounds when they're scanned with the wound analyzer, halves time to treat them manually. /// Applied into wounds when they're scanned with the wound analyzer, halves time to treat them manually.
#define TRAIT_WOUND_SCANNED "wound_scanned" #define TRAIT_WOUND_SCANNED "wound_scanned"
/// Owner will ignore any fire protection when calculating fire damage
#define TRAIT_IGNORE_FIRE_PROTECTION "ignore_fire_protection"
#define TRAIT_NODEATH "nodeath" #define TRAIT_NODEATH "nodeath"
#define TRAIT_NOHARDCRIT "nohardcrit" #define TRAIT_NOHARDCRIT "nohardcrit"
#define TRAIT_NOSOFTCRIT "nosoftcrit" #define TRAIT_NOSOFTCRIT "nosoftcrit"

10
code/modules/surgery/organs/internal/eyes/_eyes.dm
View File

@@ -69,8 +69,8 @@
eye_recipient.cure_blind(NO_EYES) eye_recipient.cure_blind(NO_EYES)
apply_damaged_eye_effects() apply_damaged_eye_effects()
refresh(receiver, call_update = TRUE) refresh(eye_recipient, call_update = TRUE)
RegisterSignal(receiver, COMSIG_ATOM_BULLET_ACT, PROC_REF(on_bullet_act)) RegisterSignal(eye_recipient, COMSIG_ATOM_BULLET_ACT, PROC_REF(on_bullet_act))
/// Refreshes the visuals of the eyes /// Refreshes the visuals of the eyes
/// If call_update is TRUE, we also will call update_body /// If call_update is TRUE, we also will call update_body
@@ -126,10 +126,10 @@
if(!special) if(!special)
eye_owner.become_blind(NO_EYES) eye_owner.become_blind(NO_EYES)
organ_owner.update_tint() eye_owner.update_tint()
organ_owner.update_sight() eye_owner.update_sight()
is_emissive = FALSE // SKYRAT EDIT ADDITION is_emissive = FALSE // SKYRAT EDIT ADDITION
UnregisterSignal(organ_owner, COMSIG_ATOM_BULLET_ACT) UnregisterSignal(eye_owner, COMSIG_ATOM_BULLET_ACT)
/obj/item/organ/internal/eyes/proc/on_bullet_act(datum/source, obj/projectile/proj, def_zone) /obj/item/organ/internal/eyes/proc/on_bullet_act(datum/source, obj/projectile/proj, def_zone)
SIGNAL_HANDLER SIGNAL_HANDLER

4
modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/pillow.dm
View File

@@ -251,7 +251,7 @@
base_icon_state = "pillowpile_small" base_icon_state = "pillowpile_small"
pseudo_z_axis = 4 pseudo_z_axis = 4
var/current_color = "pink" var/current_color = "pink"
var/mutable_appearance/armrest has_armrest = TRUE
//Containing pillows that we have here. //Containing pillows that we have here.
var/pillow1_color = "pink" var/pillow1_color = "pink"
@@ -272,7 +272,7 @@
update_icon() update_icon()
return ..() return ..()
/obj/structure/chair/pillow_small/proc/GetArmrest() /obj/structure/chair/pillow_small/GetArmrest()
if(current_color == "pink") if(current_color == "pink")
return mutable_appearance('modular_skyrat/modules/modular_items/lewd_items/icons/obj/lewd_structures/pillows.dmi', "pillowpile_small_pink_overlay") return mutable_appearance('modular_skyrat/modules/modular_items/lewd_items/icons/obj/lewd_structures/pillows.dmi', "pillowpile_small_pink_overlay")
if(current_color == "teal") if(current_color == "teal")