cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-19 02:54:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removes a lot of redefined procs (#26186)

Browse Source 
* aaaaaaaaaaaaaaa

* Forgor

* Adds missing /proc/

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
This commit is contained in:
DGamerL
2024-07-30 15:19:32 +02:00
committed by GitHub
parent cbeedfca9f
commit b497e4c925
76 changed files with 154 additions and 450 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mod/modules/modules_general.dm
+7 -10
View File
@@ -19,6 +19,13 @@
/obj/item/mod/module/storage/Initialize()
. = ..()
ADD_TRAIT(src, TRAIT_ADJACENCY_TRANSPARENT, ROUNDSTART_TRAIT)
var/obj/item/storage/backpack/modstorage/S = new(src)
bag = S
bag.max_w_class = max_w_class
bag.max_combined_w_class = max_combined_w_class
bag.storage_slots = max_items
bag.source = src
bag.forceMove(src)
/obj/item/mod/module/storage/serialize()
var/list/data = ..()
@@ -31,16 +38,6 @@
bag = list_to_object(data["bag"], src)
bag.source = src
/obj/item/mod/module/storage/Initialize(mapload)
. = ..()
var/obj/item/storage/backpack/modstorage/S = new(src)
bag = S
bag.max_w_class = max_w_class
bag.max_combined_w_class = max_combined_w_class
bag.storage_slots = max_items
bag.source = src
bag.forceMove(src)
/obj/item/mod/module/storage/Destroy()
QDEL_NULL(bag)
return ..()
code/modules/mod/modules/modules_supply.dm
+7 -10
View File
@@ -312,16 +312,6 @@
/obj/item/mod/module/ash_accretion/Initialize(mapload)
. = ..()
armor_mod_2 = new armor_mod_1
/obj/item/mod/module/ash_accretion/Destroy()
QDEL_NULL(armor_mod_2)
return ..()
/obj/item/mod/armor/mod_ash_accretion
armor = list(MELEE = 4, BULLET = 1, LASER = 2, ENERGY = 1, BOMB = 4, RAD = 0, FIRE = 0, ACID = 0)
/obj/item/mod/module/ash_accretion/Initialize(mapload)
. = ..()
if(!accretion_turfs)
accretion_turfs = typecacheof(list(
/turf/simulated/floor/plating/asteroid
@@ -333,6 +323,13 @@
/turf/simulated/floor/indestructible/necropolis
))
/obj/item/mod/module/ash_accretion/Destroy()
QDEL_NULL(armor_mod_2)
return ..()
/obj/item/mod/armor/mod_ash_accretion
armor = list(MELEE = 4, BULLET = 1, LASER = 2, ENERGY = 1, BOMB = 4, RAD = 0, FIRE = 0, ACID = 0)
/obj/item/mod/module/ash_accretion/on_suit_activation()
RegisterSignal(mod.wearer, COMSIG_MOVABLE_MOVED, PROC_REF(on_move))