Updated SSAtoms to TG's version (#18032)

* emperor protects

* sdfas

* sadf

* sdf
This commit is contained in:
Fluffy
2023-12-25 20:38:08 +00:00
committed by GitHub
parent 472d379ad7
commit a02be9f1fd
42 changed files with 495 additions and 281 deletions
@@ -227,7 +227,7 @@
SSjobs.EquipCustomDeferred(mannequin, src, leftovers, used_slots)
if (!SSATOMS_IS_PROBABLY_DONE)
SSatoms.ForceInitializeContents(mannequin)
SSatoms.CreateAtoms(list(mannequin))
mannequin.regenerate_icons()
else
mannequin.update_icon()
+4 -3
View File
@@ -27,9 +27,10 @@
/mob/living/announcer/Initialize()
// we specifically do not call parent Initialize here because this mob should not need it and its point is to be lightweight
SHOULD_CALL_PARENT(FALSE)
if(initialized)
crash_with("Warning: [src]([type]) initialized multiple times!")
initialized = TRUE
if(flags_1 & INITIALIZED_1)
stack_trace("Warning: [src]([type]) initialized multiple times!")
flags_1 |= INITIALIZED_1
for(var/K in all_languages)
add_language(K)
@@ -2,11 +2,13 @@
real_name = "Test Dummy"
status_flags = GODMODE|CANPUSH
/mob/living/carbon/human/dummy/mannequin
mob_thinks = FALSE
INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy/mannequin)
/mob/living/carbon/human/dummy/mannequin/Initialize()
. = ..()
mob_list -= src
@@ -137,9 +137,6 @@
filling.color = COLOR_PINK
add_overlay(filling)
initialized = TRUE
return INITIALIZE_HINT_NORMAL
/obj/item/docility_serum/attack(mob/living/carbon/slime/M as mob, mob/user as mob)
if(!istype(M, /mob/living/carbon/slime/))//If target is not a slime.
to_chat(user, SPAN_WARNING("The docility serum only works on slimes!"))
@@ -183,9 +180,6 @@
filling.color = COLOR_PALE_PINK
add_overlay(filling)
initialized = TRUE
return INITIALIZE_HINT_NORMAL
/obj/item/advanced_docility_serum/attack(mob/living/carbon/slime/M as mob, mob/user as mob)
if(!istype(M, /mob/living/carbon/slime/))//If target is not a slime.
to_chat(user, SPAN_WARNING("The docility serum only works on slimes!"))
@@ -226,11 +220,14 @@
/obj/item/slimesteroid/Initialize() // Better than hardsprited in stuff.
SHOULD_CALL_PARENT(FALSE)
if(flags_1 & INITIALIZED_1)
stack_trace("Warning: [src]([type]) initialized multiple times!")
flags_1 |= INITIALIZED_1
var/mutable_appearance/filling = mutable_appearance(icon, "[icon_state]-100")
filling.color = COLOR_GREEN
add_overlay(filling)
initialized = TRUE
return INITIALIZE_HINT_NORMAL
/obj/item/slimesteroid/attack(mob/living/carbon/slime/M as mob, mob/user as mob)
@@ -262,11 +259,14 @@
/obj/item/extract_enhancer/Initialize() // Better than hardsprited in stuff.
SHOULD_CALL_PARENT(FALSE)
if(flags_1 & INITIALIZED_1)
stack_trace("Warning: [src]([type]) initialized multiple times!")
flags_1 |= INITIALIZED_1
var/mutable_appearance/filling = mutable_appearance(icon, "[icon_state]-100")
filling.color = COLOR_BLUE
add_overlay(filling)
initialized = TRUE
return INITIALIZE_HINT_NORMAL
/obj/effect/golemrune
@@ -31,9 +31,6 @@
. = ..()
createCorpse()
initialized = TRUE
return INITIALIZE_HINT_NORMAL
/obj/effect/landmark/mobcorpse/proc/createCorpse() //Creates a mob and checks for gear in each slot before attempting to equip it.
var/mob/living/carbon/human/M = new /mob/living/carbon/human (src.loc)
M.real_name = src.name