Updated SSgarbage (#18173)

* pain

* sadfas

* sdfa

* sdfasf

* sfa

* sdf

* might the lord have mercy on our soul

* i cri everidai

* adeste fideles

* sdf

* where will this lead, what's coming next, from your inventions

* dear lord

* gjvhk

* i cri everidai

* fsgf

* sdfa

* sdaf

* hiuhi
This commit is contained in:
Fluffy
2024-01-15 14:08:27 +00:00
committed by GitHub
parent 0c8bdbdd68
commit ca6b04e1d7
125 changed files with 1574 additions and 805 deletions
@@ -20,6 +20,7 @@
if(on_open_network)
GLOB.cameranet.remove_source(src)
. = ..()
GC_TEMPORARY_HARDDEL
/obj/machinery/camera/proc/update_coverage(var/network_change = 0)
if(network_change)
+2
View File
@@ -45,6 +45,8 @@
//This is just a commonly used configuration for the equip_to_slot_if_possible() proc, used to equip people when the rounds tarts and when events happen and such.
/mob/proc/equip_to_slot_or_del(obj/item/W as obj, slot)
SHOULD_NOT_SLEEP(TRUE)
. = equip_to_slot_if_possible(W, slot, TRUE, TRUE, FALSE, TRUE)
// Convinience proc. Collects crap that fails to equip either onto the mob's back, or drops it.
-1
View File
@@ -43,7 +43,6 @@
if(pAI)
if(isturf(loc))
drop_from_inventory(pAI, get_turf(src))
pAI.throw_at_random(FALSE, 3, 1)
else
drop_from_inventory(pAI, loc)
pAI = null
+5
View File
@@ -62,7 +62,11 @@ var/list/cleanbot_types // Going to use this to generate a list of types once th
patrol_path = null
target = null
ignorelist = null
next_dest_loc = null
QDEL_NULL(listener)
SSradio.remove_object(listener, beacon_freq)
GLOB.janitorial_supplies -= src
return ..()
@@ -353,6 +357,7 @@ var/list/cleanbot_types // Going to use this to generate a list of types once th
/obj/cleanbot_listener/Destroy()
cleanbot = null
SSradio.remove_object_all(src)
return ..()
/* Assembly */
@@ -50,6 +50,37 @@
var/can_attach = TRUE // Whether they can attach to a host
/mob/living/carbon/alien/diona/Initialize(var/mapload, var/flower_chance = 5)
if(prob(flower_chance))
flower_color = get_random_colour(1)
. = ..(mapload)
//species = GLOB.all_species[]
ingested = new /datum/reagents/metabolism(500, src, CHEM_INGEST)
reagents = ingested
set_species(SPECIES_DIONA)
setup_dionastats()
eat_types |= TYPE_ORGANIC
nutrition = 0 //We dont start with biomass
update_verbs()
/mob/living/carbon/alien/diona/Destroy()
cleanupTransfer()
QDEL_NULL(ingested)
QDEL_NULL(vessel)
QDEL_NULL(DS)
gestalt = null
master_nymph = null
hat = null
flower_color = null
flower_image = null
cut_overlays()
. = ..()
GC_TEMPORARY_HARDDEL
/mob/living/carbon/alien/diona/get_ingested_reagents()
return ingested
@@ -92,20 +123,6 @@
else
..()
/mob/living/carbon/alien/diona/Initialize(var/mapload, var/flower_chance = 5)
if(prob(flower_chance))
flower_color = get_random_colour(1)
. = ..(mapload)
//species = GLOB.all_species[]
ingested = new /datum/reagents/metabolism(500, src, CHEM_INGEST)
reagents = ingested
set_species(SPECIES_DIONA)
setup_dionastats()
eat_types |= TYPE_ORGANIC
nutrition = 0 //We dont start with biomass
update_verbs()
/mob/living/carbon/alien/diona/verb/check_light()
set category = "Abilities"
set name = "Check light level"
@@ -321,14 +338,6 @@
return TRUE
/mob/living/carbon/alien/diona/Destroy()
walk_to(src, 0)
cleanupTransfer()
QDEL_NULL(ingested)
QDEL_NULL(vessel)
QDEL_NULL(DS)
. = ..()
/mob/living/carbon/alien/diona/proc/wear_hat(var/obj/item/new_hat)
if(hat)
return
@@ -21,7 +21,8 @@
death(1) //Brains can die again. AND THEY SHOULD AHA HA HA HA HA HA
ghostize() //Ghostize checks for key so nothing else is necessary.
container = null
return ..()
. = ..()
GC_TEMPORARY_HARDDEL
/mob/living/carbon/brain/IsAdvancedToolUser() // to be able to use weapons when piloting a hardsuit
return TRUE
@@ -9,8 +9,6 @@
for(var/obj/item/organ/external/E in src.organs)
E.droplimb(0,DROPLIMB_EDGE,1)
sleep(1)
for(var/obj/item/I in src)
drop_from_inventory(I)
I.throw_at(get_edge_target_turf(src,pick(GLOB.alldirs)), rand(1,3), round(30/I.w_class))
@@ -104,7 +104,7 @@
/mob/living/carbon/human/Destroy()
GLOB.human_mob_list -= src
GLOB.intent_listener -= src
QDEL_NULL_LIST(organs)
QDEL_LIST(organs)
internal_organs_by_name = null
internal_organs = null
organs_by_name = null
@@ -130,7 +130,8 @@
// Do this last so the mob's stuff doesn't drop on del.
QDEL_NULL(w_uniform)
return ..()
. = ..()
GC_TEMPORARY_HARDDEL
/mob/living/carbon/human/can_devour(atom/movable/victim, var/silent = FALSE)
if(!should_have_organ(BP_STOMACH))
@@ -801,7 +801,7 @@
A.ex_act(2)
sleep(1)
if (A && !(A.gcDestroyed) && A.type == oldtype)
if (A && !(A.gc_destroyed) && A.type == oldtype)
src.visible_message("<span class='danger'>[src.name] plows into \the [aname]!</span>")
return 0
@@ -52,7 +52,7 @@
friends = null
target_mob = null
targets = null
QDEL_NULL_ASSOC(target_type_validator_map)
QDEL_LIST_ASSOC_VAL(target_type_validator_map)
return ..()
/mob/living/simple_animal/hostile/can_name(var/mob/living/M)
@@ -187,6 +187,14 @@
if(dead_on_map)
death()
/mob/living/simple_animal/Destroy()
cut_overlay(blood_overlay)
movement_target = null
QDEL_NULL(udder)
. = ..()
GC_TEMPORARY_HARDDEL
/mob/living/simple_animal/Move(NewLoc, direct)
. = ..()
if(.)