Skip to content

Commit ae9f9db

Browse files
authored
Minor preround changes (done postround) (#921)
1 parent c6ada70 commit ae9f9db

4 files changed

Lines changed: 17 additions & 1 deletion

File tree

code/modules/mob/living/basic/space_fauna/regal_rat/regal_rat.dm

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,17 @@
7676
var/datum/component/potential_component = GetComponent(/datum/component/ghost_direct_control)
7777
if(!QDELETED(potential_component))
7878
qdel(potential_component)
79-
return ..()
79+
. = ..()
80+
if(gibbed)
81+
return
82+
AddComponent( \
83+
/datum/component/complex_smell, \
84+
duration = 30 MINUTES, \
85+
smell = /datum/smell/decay, \
86+
intensity = SMELL_INTENSITY_STRONG, \
87+
radius = 3, \
88+
clear_signals = list(COMSIG_MOB_STATCHANGE), \
89+
)
8090

8191
/mob/living/basic/regal_rat/examine(mob/user)
8292
. = ..()

code/modules/surgery/organs/external/spines.dm

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
name = "lizard spines"
44
desc = "Not an actual spine, obviously."
55
icon_state = "spines"
6+
gender = PLURAL
67

78
zone = BODY_ZONE_CHEST
89
slot = ORGAN_SLOT_EXTERNAL_SPINES

maplestation_modules/code/modules/mob/living/carbon/human/species_types/synth/android_heart.dm

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44
icon_state = /obj/item/organ/heart/cybernetic/tier2::icon_state
55
organ_flags = ORGAN_ROBOTIC
66

7+
/obj/item/organ/heart/android/Initialize(mapload)
8+
. = ..()
9+
AddElement(/datum/element/update_icon_blocker)
10+
711
/obj/item/organ/heart/android/emp_act(severity)
812
. = ..()
913
if(. & EMP_PROTECT_SELF)

maplestation_modules/code/modules/mob/living/carbon/human/species_types/synth/android_lungs.dm

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
desc = "Electronic devices designed to mimic the functions of human lungs. Provides necessary cooling."
44
icon_state = /obj/item/organ/lungs/cybernetic/tier2::icon_state
55
organ_flags = ORGAN_ROBOTIC
6+
gender = NEUTER
67

78
safe_oxygen_min = 0
89

0 commit comments

Comments
 (0)