cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-27 05:57:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

More GC Define Transitions

Browse Source
This commit is contained in:
Fox-McCloud
2017-05-13 04:24:05 -04:00
parent 862a353d46
commit 31c9519f3e
41 changed files with 61 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/buildmode.dm
+2 -5
View File
@@ -123,8 +123,7 @@
if(istype(cl))
cl.images -= I
cl = null
qdel(I)
I = null
QDEL_NULL(I)
return ..()
/datum/click_intercept
@@ -139,9 +138,7 @@
holder.screen += buttons
/datum/click_intercept/Destroy()
for(var/button in buttons)
qdel(button)
buttons.Cut()
QDEL_LIST(buttons)
return ..()
code/modules/assembly/infrared.dm
+1 -2
View File
@@ -16,8 +16,7 @@
/obj/item/device/assembly/infra/Destroy()
if(first)
qdel(first)
first = null
QDEL_NULL(first)
last = null
fire_location = null
return ..()
code/modules/flufftext/Hallucination.dm
+2 -4
View File
@@ -165,13 +165,11 @@ Gunshots/explosions/opening doors/less rare audio (done)
/obj/effect/hallucination/fake_flood/Destroy()
processing_objects -= src
qdel(flood_turfs)
flood_turfs = list()
flood_turfs.Cut()
if(target.client)
target.client.images.Remove(flood_images)
target = null
qdel(flood_images)
flood_images = list()
QDEL_LIST(flood_images)
return ..()
/obj/effect/hallucination/simple/xeno
code/modules/food_and_drinks/food/customizables.dm
+1 -2
View File
@@ -372,8 +372,7 @@
overlays += T
/obj/item/weapon/reagent_containers/food/snacks/customizable/Destroy()
for(var/obj/item/O in ingredients)
qdel(O)
QDEL_LIST(ingredients)
return ..()
/obj/item/weapon/reagent_containers/food/snacks/customizable/examine(mob/user)
code/modules/food_and_drinks/kitchen_machinery/gibber.dm
+2 -1
View File
@@ -28,7 +28,8 @@
if(contents.len)
for(var/atom/movable/A in contents)
A.loc = get_turf(src)
if(occupant) occupant = null
if(occupant)
occupant = null
return ..()
/obj/machinery/gibber/RefreshParts() //If you want to make the machine upgradable, this is where you would change any vars basd on its stock parts.
code/modules/mining/mine_items.dm
+1 -2
View File
@@ -227,8 +227,7 @@
/obj/item/device/mobcapsule/Destroy()
if(captured)
captured.ghostize()
qdel(captured)
captured = null
QDEL_NULL(captured)
return ..()
/obj/item/device/mobcapsule/attack(var/atom/A, mob/user, prox_flag)
code/modules/mob/dead/observer/observer.dm
+4 -5
View File
@@ -94,8 +94,7 @@ var/list/image/ghost_darkness_images = list() //this is a list of images for thi
following = null
if(ghostimage)
ghost_darkness_images -= ghostimage
qdel(ghostimage)
ghostimage = null
QDEL_NULL(ghostimage)
updateallghostimages()
return ..()
@@ -642,13 +641,13 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
/mob/proc/can_admin_interact()
return FALSE
/mob/proc/can_advanced_admin_interact()
return FALSE
/mob/dead/observer/can_admin_interact()
return check_rights(R_ADMIN, 0, src)
/mob/dead/observer/can_advanced_admin_interact()
if(!can_admin_interact())
return FALSE
@@ -657,7 +656,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
return TRUE
return FALSE
/mob/dead/observer/incapacitated()
return TRUE
code/modules/mob/living/carbon/carbon.dm
+2 -4
View File
@@ -17,10 +17,8 @@
med_hud_set_status()
/mob/living/carbon/Destroy()
for(var/atom/movable/guts in internal_organs)
qdel(guts)
for(var/atom/movable/food in stomach_contents)
qdel(food)
QDEL_LIST(internal_organs)
QDEL_LIST(stomach_contents)
remove_from_all_data_huds()
return ..()
code/modules/mob/living/silicon/robot/robot_modules.dm
+1 -3
View File
@@ -32,9 +32,7 @@
emag.name = "Placeholder Emag Item"
/obj/item/weapon/robot_module/Destroy()
for(var/module in modules)
qdel(module)
modules.Cut()
QDEL_LIST(modules)
QDEL_NULL(emag)
return ..()
code/modules/modular_computers/hardware/hard_drive.dm
+1 -2
View File
@@ -119,8 +119,7 @@
return null
/obj/item/weapon/computer_hardware/hard_drive/Destroy()
for(var/file in stored_files)
qdel(file)
QDEL_LIST(stored_files)
stored_files = null
return ..()
code/modules/paperwork/paperbin.dm
+1 -4
View File
@@ -18,10 +18,7 @@
..()
/obj/item/weapon/paper_bin/Destroy()
if(papers)
for(var/i in papers)
qdel(i)
papers.Cut()
QDEL_LIST(papers)
return ..()
/obj/item/weapon/paper_bin/burn()
code/modules/pda/PDA.dm
+1 -3
View File
@@ -464,9 +464,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
pai.forceMove(T)
current_app = null
scanmode = null
for(var/A in programs)
qdel(A)
programs.Cut()
QDEL_LIST(programs)
QDEL_NULL(cartridge)
return ..()
code/modules/pda/cart.dm
+2 -6
View File
@@ -25,12 +25,8 @@
/obj/item/weapon/cartridge/Destroy()
QDEL_NULL(radio)
for(var/A in programs)
qdel(A)
programs.Cut()
for(var/A in messenger_plugins)
qdel(A)
messenger_plugins.Cut()
QDEL_LIST(programs)
QDEL_LIST(messenger_plugins)
return ..()
/obj/item/weapon/cartridge/proc/update_programs(obj/item/device/pda/pda)
code/modules/power/singularity/singularity.dm
+1 -2
View File
@@ -39,11 +39,10 @@
processing_objects.Add(src)
poi_list |= src
singularities += src
for(var/obj/machinery/power/singularity_beacon/singubeacon in world)
for(var/obj/machinery/power/singularity_beacon/singubeacon in machines)
if(singubeacon.active)
target = singubeacon
break
return
/obj/singularity/Destroy()
processing_objects.Remove(src)
code/modules/power/tesla/coil.dm
+1 -3
View File
@@ -21,9 +21,7 @@
RefreshParts()
/obj/machinery/power/tesla_coil/Destroy()
if(wires)
qdel(wires)
wires = null
QDEL_NULL(wires)
return ..()
/obj/machinery/power/tesla_coil/RefreshParts()
code/modules/power/tesla/energy_ball.dm
+1 -3
View File
@@ -49,9 +49,7 @@ var/list/blacklisted_tesla_types = typecacheof(list(/obj/machinery/atmospherics,
EB.orbiting_balls -= src
orbiting = null
for(var/ball in orbiting_balls)
var/obj/singularity/energy_ball/EB = ball
qdel(EB)
QDEL_LIST(orbiting_balls)
return ..()
code/modules/projectiles/ammunition.dm
+2 -3
View File
@@ -103,8 +103,7 @@
update_icon()
/obj/item/ammo_box/Destroy()
for(var/atom/A in stored_ammo)
qdel(A)
QDEL_LIST(stored_ammo)
stored_ammo = null
return ..()
@@ -193,4 +192,4 @@
var/turf_mag = get_turf(src)
for(var/obj/item/ammo in stored_ammo)
ammo.forceMove(turf_mag)
stored_ammo -= ammo
stored_ammo -= ammo
code/modules/projectiles/guns/rocket.dm
+1 -3
View File
@@ -20,10 +20,8 @@
to_chat(user, "<span class='notice'>[rockets.len] / [max_rockets] rockets.</span>")
/obj/item/weapon/gun/rocketlauncher/Destroy()
for(var/datum/D in rockets)
qdel(D)
QDEL_LIST(rockets)
rockets = null
return ..()
/obj/item/weapon/gun/rocketlauncher/update_icon()
code/modules/projectiles/guns/throw.dm
+1 -3
View File
@@ -37,10 +37,8 @@
/obj/item/weapon/gun/throw/Destroy()
QDEL_NULL(to_launch)
for(var/atom/A in loaded_projectiles)
qdel(A)
QDEL_LIST(loaded_projectiles)
loaded_projectiles = null
return ..()
/obj/item/weapon/gun/throw/update_icon()
code/modules/projectiles/projectile/reusable.dm
+1 -1
View File
@@ -57,7 +57,7 @@
newdart.update_icon()
/obj/item/projectile/bullet/reusable/foam_dart/Destroy()
pen = null
QDEL_NULL(pen)
return ..()
/obj/item/projectile/bullet/reusable/foam_dart/riot
code/modules/reagents/chemistry/holder.dm
+1 -3
View File
@@ -747,9 +747,7 @@ atom/proc/create_reagents(max_vol)
/datum/reagents/Destroy()
. = ..()
processing_objects -= src
for(var/datum/reagent/R in reagent_list)
qdel(R)
reagent_list.Cut()
QDEL_LIST(reagent_list)
reagent_list = null
if(my_atom && my_atom.reagents == src)
my_atom.reagents = null
code/modules/space_management/space_chunk.dm
+1 -3
View File
@@ -28,9 +28,7 @@
set_occupied(FALSE)
if(parent)
parent.children -= src
for(var/datum/space_chunk/child in children)
qdel(child)
children.Cut()
QDEL_LIST(children)
parent = null
. = ..()
code/modules/station_goals/dna_vault.dm
+7 -6
View File
@@ -131,8 +131,8 @@ var/list/non_simple_animals = typecacheof(list(/mob/living/carbon/human/monkey,/
var/obj/machinery/parent
/obj/structure/filler/ex_act()
return
return
/obj/machinery/dna_vault
name = "DNA Vault"
desc = "Break glass in case of apocalypse."
@@ -177,7 +177,7 @@ var/list/non_simple_animals = typecacheof(list(/mob/living/carbon/human/monkey,/
plants_max = G.plant_count
dna_max = G.human_count
break
..()
/obj/machinery/dna_vault/Destroy()
@@ -185,13 +185,14 @@ var/list/non_simple_animals = typecacheof(list(/mob/living/carbon/human/monkey,/
var/obj/structure/filler/filler = V
filler.parent = null
qdel(filler)
fillers.Cut()
. = ..()
/obj/machinery/dna_vault/attack_ghost(mob/user)
if(stat & (BROKEN|MAINT))
return
return ui_interact(user)
/obj/machinery/dna_vault/attack_hand(mob/user)
if(..())
return 1
@@ -296,7 +297,7 @@ var/list/non_simple_animals = typecacheof(list(/mob/living/carbon/human/monkey,/
grant_power(H, JUMPBLOCK, JUMPY)
grant_power(H, INCREASERUNBLOCK, RUN)
power_lottery[H] = list()
/obj/machinery/dna_vault/proc/grant_power(mob/living/carbon/human/H, block, power)
H.dna.SetSEState(block, 1, 1)
H.mutations |= power
code/modules/surgery/organs/organ_external.dm
+1 -3
View File
@@ -96,9 +96,7 @@
if(owner)
owner.bodyparts_by_name[limb_name] = null
if(children)
for(var/obj/item/organ/external/C in children)
qdel(C)
QDEL_LIST(children)
if(wound_cleanup_timer)
deltimer(wound_cleanup_timer)
code/modules/telesci/telesci_computer.dm
+1 -1
View File
@@ -38,7 +38,7 @@
/obj/machinery/computer/telescience/Destroy()
eject()
if(inserted_gps)
inserted_gps.loc = loc
inserted_gps.forceMove(loc)
inserted_gps = null
return ..()