cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-20 04:17:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Convert storage objects to initialize (#2850)

Browse Source 
changes:

Converted storage objects to Initialize().
Removed timer from storage New/Initialize in favor of LateInitialize.
Removed some pointless src from storage objects.
Fixed GC of some screen objects used by storage objects.
Changed storage objects' filling to be done by fill() instead of New()/Initialize().
Medkits actually work this time!
This commit is contained in:
Lohikar
2017-06-28 15:09:59 -05:00
committed by skull132
parent 9a899801b1
commit c077b12899
19 changed files with 281 additions and 272 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/chameleon.dm
+1 -1
View File
@@ -199,7 +199,7 @@
origin_tech = list(TECH_ILLEGAL = 3)
var/global/list/clothing_choices
/obj/item/weapon/storage/backpack/chameleon/New()
/obj/item/weapon/storage/backpack/chameleon/fill()
..()
if(!clothing_choices)
var/blocked = list(src.type, /obj/item/weapon/storage/backpack/satchel/withwallet)
code/modules/detectivework/tools/crimekit.dm
+2 -2
View File
@@ -9,11 +9,11 @@
max_storage_space = 35
contained_sprite = 1
/obj/item/weapon/storage/briefcase/crimekit/New()
/obj/item/weapon/storage/briefcase/crimekit/fill()
..()
new /obj/item/weapon/storage/box/swabs(src)
new /obj/item/weapon/storage/box/fingerprints(src)
new /obj/item/weapon/reagent_containers/spray/luminol(src)
new /obj/item/device/uv_light(src)
new /obj/item/weapon/forensics/sample_kit(src)
new /obj/item/weapon/forensics/sample_kit/powder(src)
new /obj/item/weapon/forensics/sample_kit/powder(src)
code/modules/detectivework/tools/storage.dm
+4 -4
View File
@@ -6,7 +6,7 @@
can_hold = list(/obj/item/weapon/forensics/swab)
storage_slots = 14
/obj/item/weapon/storage/box/swabs/New()
/obj/item/weapon/storage/box/swabs/fill()
..()
for(var/i=0;i<storage_slots,i++) // Fill 'er up.
new /obj/item/weapon/forensics/swab(src)
@@ -16,7 +16,7 @@
icon_state = "solution_trays"
storage_slots = 7
/obj/item/weapon/storage/box/slides/New()
/obj/item/weapon/storage/box/slides/fill()
..()
for(var/i=0;i<storage_slots,i++)
new /obj/item/weapon/forensics/slide(src)
@@ -26,7 +26,7 @@
desc = "A box claiming to contain evidence bags."
storage_slots = 6
/obj/item/weapon/storage/box/evidence/New()
/obj/item/weapon/storage/box/evidence/fill()
..()
for(var/i=0;i<storage_slots,i++)
new /obj/item/weapon/evidencebag(src)
@@ -39,7 +39,7 @@
can_hold = list(/obj/item/weapon/sample/print)
storage_slots = 14
/obj/item/weapon/storage/box/fingerprints/New()
/obj/item/weapon/storage/box/fingerprints/fill()
..()
for(var/i=0;i<storage_slots,i++)
new /obj/item/weapon/sample/print(src)
code/modules/hydroponics/seed_machines.dm
+1 -1
View File
@@ -27,7 +27,7 @@
name = "flora disk box"
desc = "A box of flora data disks, apparently."
/obj/item/weapon/storage/box/botanydisk/New()
/obj/item/weapon/storage/box/botanydisk/fill()
..()
for(var/i = 0;i<7;i++)
new /obj/item/weapon/disk/botany(src)
code/modules/research/xenoarchaeology/tools/tools_pickaxe.dm
+1 -1
View File
@@ -169,7 +169,7 @@
max_w_class = 3
use_to_pickup = 1 // for picking up broken bulbs, not that most people will try
/obj/item/weapon/storage/box/excavation/New()
/obj/item/weapon/storage/box/excavation/fill()
..()
new /obj/item/weapon/pickaxe/brush(src)
new /obj/item/weapon/pickaxe/one_pick(src)