Skip to content

Commit

Permalink
Corrects mapload args that sprug up in the past few days (tgstation#6…
Browse files Browse the repository at this point in the history
…1759)

See tgstation#61623 . These were either merged after the prior PR, coded before the prior PR, or were made in between and not updated.
  • Loading branch information
MrMelbert committed Sep 28, 2021
1 parent 4fc5897 commit a66ef31
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 8 deletions.
2 changes: 1 addition & 1 deletion code/game/objects/effects/spawners/random/random.dm
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
var/list/spawned_table //list of all items "spawned" and how many
var/list/stat_table //list of all items "spawned" and their occurrance probability

/obj/item/loot_table_maker/Initialize()
/obj/item/loot_table_maker/Initialize(mapload)
. = ..()
make_table()

Expand Down
3 changes: 1 addition & 2 deletions code/game/objects/structures/flora.dm
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@
icon_state = "fern"
trimmable = FALSE

/obj/item/kirbyplants/fern/Initialize()
/obj/item/kirbyplants/fern/Initialize(mapload)
. = ..()
AddElement(/datum/element/swabable, CELL_LINE_TABLE_ALGAE, CELL_VIRUS_TABLE_GENERIC, rand(2,4), 5)

Expand Down Expand Up @@ -502,4 +502,3 @@
/obj/structure/flora/rock/pile/largejungle/Initialize(mapload)
. = ..()
icon_state = "[initial(icon_state)][rand(1,3)]"

3 changes: 1 addition & 2 deletions code/modules/antagonists/gang/cellphone.dm
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ GLOBAL_LIST_EMPTY(gangster_cell_phones)
var/gang_id = "Grove Street Families"
var/activated = FALSE

/obj/item/gangster_cellphone/Initialize()
/obj/item/gangster_cellphone/Initialize(mapload)
. = ..()
GLOB.gangster_cell_phones += src
become_hearing_sensitive()
Expand Down Expand Up @@ -58,4 +58,3 @@ GLOBAL_LIST_EMPTY(gangster_cell_phones)
if(HAS_TRAIT(cellphone_hearer, TRAIT_DEAF))
continue
to_chat(cellphone_hearer, span_gangradio("<b>[speaker.name]</b> \[CELL: [gang_id]\] says, \"[message]\""))

3 changes: 1 addition & 2 deletions code/modules/mob/living/simple_animal/hostile/bees.dm
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@
to_chat(user, span_warning("You don't have enough units of that chemical to modify the bee's DNA!"))
..()

/obj/item/queen_bee/Initialize()
/obj/item/queen_bee/Initialize(mapload)
. = ..()
AddElement(/datum/element/swabable, CELL_LINE_TABLE_QUEEN_BEE, CELL_VIRUS_TABLE_GENERIC_MOB, 1, 5)

Expand Down Expand Up @@ -369,4 +369,3 @@
var/mutable_appearance/body_overlay = mutable_appearance(icon = icon, icon_state = "bee_item_overlay")
body_overlay.color = beegent ? beegent.color : BEE_DEFAULT_COLOUR
. += body_overlay

2 changes: 1 addition & 1 deletion code/modules/research/server.dm
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@
var/front_panel_screws = 4
var/hdd_wires = 6

/obj/machinery/rnd/server/master/Initialize()
/obj/machinery/rnd/server/master/Initialize(mapload)
. = ..()
name = "\improper Master " + name
source_code_hdd = new(src)
Expand Down

0 comments on commit a66ef31

Please sign in to comment.