Skip to content

Commit

Permalink
Updates / fixes DME checker (MrMelbert#348)
Browse files Browse the repository at this point in the history
  • Loading branch information
MrMelbert authored Sep 18, 2023
1 parent 60042a9 commit d4a76a3
Show file tree
Hide file tree
Showing 25 changed files with 76 additions and 336 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/ci_suite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ jobs:
run: |
bash tools/ci/check_filedirs.sh maplestation.dme
bash tools/ci/check_changelogs.sh
bash tools/ci/check_grep.sh
bash tools/ci/check_grep.sh 'code/**/**.dm' '_maps/**/**.dmm'
bash tools/ci/check_grep.sh 'maplestation_modules/**/**.dm' '_maps/**/**.dmm'
bash tools/ci/check_misc.sh
tools/bootstrap/python tools/validate_dme.py <maplestation.dme
tools/bootstrap/python -m tools.maplint.source --github
Expand Down
2 changes: 2 additions & 0 deletions maplestation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -5410,6 +5410,7 @@
#include "maplestation_modules\code\game\objects\items\storage\garment.dm"
#include "maplestation_modules\code\game\objects\items\storage\storage.dm"
#include "maplestation_modules\code\game\objects\items\tcg\tdatet.dm"
#include "maplestation_modules\code\game\objects\spawners\random\contraband.dm"
#include "maplestation_modules\code\game\objects\structures\item_dispensers.dm"
#include "maplestation_modules\code\game\objects\structures\static_plaques.dm"
#include "maplestation_modules\code\game\objects\structures\crate_lockers\crates.dm"
Expand Down Expand Up @@ -5714,6 +5715,7 @@
#include "maplestation_modules\story_content\phoneguy_equipment\code\headphone.dm"
#include "maplestation_modules\story_content\post_overlay\code\post_overlay.dm"
#include "maplestation_modules\story_content\prince_equipment\code\clothing.dm"
#include "maplestation_modules\story_content\randall_equipment\code\randallclothing.dm"
#include "maplestation_modules\story_content\reshia_equipment\code\reshiaclothing.dm"
#include "maplestation_modules\story_content\ritz_equipment\code\ritzclothing.dm"
#include "maplestation_modules\story_content\story_posters\code\contraband.dm"
Expand Down
2 changes: 1 addition & 1 deletion maplestation_modules/code/datums/pain/pain_helpers.dm
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
QDEL_NULL(pain_controller)
return ..()

/mob/living/carbon/human/Initialize()
/mob/living/carbon/human/Initialize(mapload)
. = ..()
var/datum/pain/new_pain_controller = new(src)
if(!QDELETED(new_pain_controller))
Expand Down
10 changes: 5 additions & 5 deletions maplestation_modules/code/datums/pain/pain_implements.dm
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
/// The change in temperature applied to the user while our pack is in use.
var/temperature_change = 0

/obj/item/temperature_pack/Initialize()
/obj/item/temperature_pack/Initialize(mapload)
. = ..()
update_appearance()

Expand Down Expand Up @@ -207,7 +207,7 @@
/// Number of pills to spawn
var/num_pills = 0

/obj/item/storage/pill_bottle/prescription/Initialize()
/obj/item/storage/pill_bottle/prescription/Initialize(mapload)
. = ..()
if(pill_type)
name = "[initial(pill_type.name)] bottle"
Expand All @@ -227,7 +227,7 @@
custom_price = PAYCHECK_CREW * 3
custom_premium_price = PAYCHECK_CREW * 3

/obj/item/storage/pill_bottle/painkillers/Initialize()
/obj/item/storage/pill_bottle/painkillers/Initialize(mapload)
. = ..()
atom_storage.max_slots = 14
atom_storage.max_total_storage = 14
Expand Down Expand Up @@ -508,12 +508,12 @@
equip_delay_self = 1.2 SECONDS
equip_delay_other = 1.2 SECONDS

/obj/item/shock_blanket/emergency/Initialize()
/obj/item/shock_blanket/emergency/Initialize(mapload)
. = ..()
name = "emergency [name]"

// Change the contents of first-aid kids.
/obj/item/storage/medkit/emergency/Initialize()
/obj/item/storage/medkit/emergency/Initialize(mapload)
. = ..()
atom_storage.max_specific_storage = WEIGHT_CLASS_SMALL
atom_storage.max_slots = 12
Expand Down
73 changes: 0 additions & 73 deletions maplestation_modules/code/game/machinery/cryopod.dm

This file was deleted.

4 changes: 2 additions & 2 deletions maplestation_modules/code/game/machinery/fax_machine.dm
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ GLOBAL_LIST_EMPTY(fax_machines)
/// Cooldown between sending faxes
COOLDOWN_DECLARE(fax_cooldown)

/obj/machinery/fax_machine/Initialize()
/obj/machinery/fax_machine/Initialize(mapload)
. = ..()
GLOB.fax_machines += src
set_room_tag(TRUE)
Expand All @@ -103,7 +103,7 @@ GLOBAL_LIST_EMPTY(fax_machines)
/obj/machinery/fax_machine/recieving_disabled
can_receive_paperwork = FALSE

/obj/machinery/fax_machine/full/Initialize()
/obj/machinery/fax_machine/full/Initialize(mapload)
. = ..()
for(var/i in 1 to max_paperwork)
if(LAZYLEN(received_paperwork) >= max_paperwork)
Expand Down
8 changes: 4 additions & 4 deletions maplestation_modules/code/game/machinery/towel_rack.dm
Original file line number Diff line number Diff line change
Expand Up @@ -95,14 +95,14 @@
return removed_towel

/// Preset full towel rack
/obj/structure/towel_rack/full/Initialize()
/obj/structure/towel_rack/full/Initialize(mapload)
. = ..()
for(var/towel_num in 1 to max_towels)
towels += new /obj/item/towel(src)
update_appearance()

/// Preset full beach towel rack
/obj/structure/towel_rack/full_beach/Initialize()
/obj/structure/towel_rack/full_beach/Initialize(mapload)
. = ..()
for(var/towel_num in 1 to max_towels)
towels += new /obj/item/towel/beach(src)
Expand Down Expand Up @@ -160,7 +160,7 @@
removed_towel.cooling_timer_id = addtimer(CALLBACK(removed_towel, TYPE_PROC_REF(/obj/item/towel, cool_towel)), 3 MINUTES, TIMER_STOPPABLE)

/// Preset filled towel warming rack (all the towels are warm, too)
/obj/structure/towel_rack/warmer/full/Initialize()
/obj/structure/towel_rack/warmer/full/Initialize(mapload)
. = ..()
for(var/towel_num in 1 to max_towels)
var/obj/item/towel/added_towel = new(src)
Expand All @@ -169,7 +169,7 @@
update_appearance()

/// Above but with beach towels.
/obj/structure/towel_rack/warmer/full_beach/Initialize()
/obj/structure/towel_rack/warmer/full_beach/Initialize(mapload)
. = ..()
for(var/towel_num in 1 to max_towels)
var/obj/item/towel/beach/added_towel = new(src)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
desc = "The headset of the man or woman in charge of assisting and protecting the heads of staff. Protects ears from flashbangs."
icon_state = "com_headset_alt"

/obj/item/radio/headset/heads/asset_protection/alt/Initialize()
/obj/item/radio/headset/heads/asset_protection/alt/Initialize(mapload)
. = ..()
AddComponent(/datum/component/wearertargeting/earprotection, list(ITEM_SLOT_EARS))
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@
/obj/structure/closet/crate/resource_cache/random_materials
desc = "A steel crate. This one seems like trouble."

/obj/structure/closet/crate/resource_cache/random_materials/Initialize()
/obj/structure/closet/crate/resource_cache/random_materials/Initialize(mapload)
for(var/i in 1 to rand(2, 4))
resources += list(pick(subtypesof(/obj/item/stack)) = round(rand(1, 50),5))
. = ..()
Expand Down
Loading

0 comments on commit d4a76a3

Please sign in to comment.