mirror of
https://github.com/PolarisSS13/Polaris.git
synced 2026-01-02 05:23:01 +00:00
/atom New() => Initialize() [MDB IGNORE] (#8298)
* Find and replace argless atom New() to Initialize(). * Manual replacement of no-arg New() to Initialize(). * Manually replacing remaining New() overrides. * Fixing linter issues with now-removed New() args. * Tidying area init overrides. * Porting Neb's atom subsystem. * Trying to isolate init problems. * Adjusting Init code post-test. * Merging duplicate Initialize() procs. * Merge resolution.
This commit is contained in:
@@ -14,8 +14,8 @@
|
||||
icon_state = "cag_black"
|
||||
blanks = 0
|
||||
|
||||
/obj/item/weapon/deck/cah/New()
|
||||
..()
|
||||
/obj/item/weapon/deck/cah/Initialize()
|
||||
. = ..()
|
||||
var/datum/playingcard/P
|
||||
for(var/cardtext in card_text_list)
|
||||
P = new()
|
||||
|
||||
@@ -4,8 +4,8 @@
|
||||
icon_state = "card_pack_cardemon"
|
||||
parentdeck = "cardemon"
|
||||
|
||||
/obj/item/weapon/pack/cardemon/New()
|
||||
..()
|
||||
/obj/item/weapon/pack/cardemon/Initialize()
|
||||
. = ..()
|
||||
var/datum/playingcard/P
|
||||
var/i
|
||||
for(i=0; i<5; i++)
|
||||
|
||||
@@ -21,8 +21,8 @@
|
||||
drop_sound = 'sound/items/drop/paper.ogg'
|
||||
pickup_sound = 'sound/items/pickup/paper.ogg'
|
||||
|
||||
/obj/item/weapon/deck/cards/New()
|
||||
..()
|
||||
/obj/item/weapon/deck/cards/Initialize()
|
||||
. = ..()
|
||||
var/datum/playingcard/P
|
||||
for(var/suit in list("spades","clubs","diamonds","hearts"))
|
||||
|
||||
|
||||
@@ -8,7 +8,8 @@
|
||||
var/result = 6
|
||||
attack_verb = list("diced")
|
||||
|
||||
/obj/item/weapon/dice/New()
|
||||
/obj/item/weapon/dice/Initialize()
|
||||
. = ..()
|
||||
icon_state = "[name][rand(1,sides)]"
|
||||
|
||||
/obj/item/weapon/dice/d4
|
||||
@@ -83,8 +84,8 @@
|
||||
drop_sound = 'sound/items/drop/hat.ogg'
|
||||
pickup_sound = 'sound/items/pickup/hat.ogg'
|
||||
|
||||
/obj/item/weapon/storage/pill_bottle/dice/New()
|
||||
..()
|
||||
/obj/item/weapon/storage/pill_bottle/dice/Initialize()
|
||||
. = ..()
|
||||
for(var/i = 1 to 7)
|
||||
new /obj/item/weapon/dice( src )
|
||||
|
||||
@@ -96,8 +97,8 @@
|
||||
drop_sound = 'sound/items/drop/hat.ogg'
|
||||
pickup_sound = 'sound/items/pickup/hat.ogg'
|
||||
|
||||
/obj/item/weapon/storage/pill_bottle/dice_nerd/New()
|
||||
..()
|
||||
/obj/item/weapon/storage/pill_bottle/dice_nerd/Initialize()
|
||||
. = ..()
|
||||
new /obj/item/weapon/dice/d4( src )
|
||||
new /obj/item/weapon/dice( src )
|
||||
new /obj/item/weapon/dice/d8( src )
|
||||
@@ -155,7 +156,7 @@
|
||||
revealDice(player)
|
||||
|
||||
|
||||
/obj/item/weapon/storage/dicecup/loaded/New()
|
||||
..()
|
||||
/obj/item/weapon/storage/dicecup/loaded/Initialize()
|
||||
. = ..()
|
||||
for(var/i = 1 to 5)
|
||||
new /obj/item/weapon/dice( src )
|
||||
@@ -4,8 +4,8 @@
|
||||
icon_state = "card_pack_spaceball"
|
||||
parentdeck = "spaceball"
|
||||
|
||||
/obj/item/weapon/pack/spaceball/New()
|
||||
..()
|
||||
/obj/item/weapon/pack/spaceball/Initialize()
|
||||
. = ..()
|
||||
var/datum/playingcard/P
|
||||
var/i
|
||||
var/year = 554 + text2num(time2text(world.timeofday, "YYYY"))
|
||||
|
||||
@@ -6,8 +6,8 @@
|
||||
desc = "For all your occult needs!"
|
||||
icon_state = "deck_tarot"
|
||||
|
||||
/obj/item/weapon/deck/tarot/New()
|
||||
..()
|
||||
/obj/item/weapon/deck/tarot/Initialize()
|
||||
. = ..()
|
||||
|
||||
var/datum/playingcard/P
|
||||
for(var/name in list("Fool","Magician","High Priestess","Empress","Emperor","Hierophant","Lovers","Chariot","Strength","Hermit","Wheel of Fortune","Justice","Hanged Man","Death","Temperance","Devil","Tower","Star","Moon","Sun","Judgement","World"))
|
||||
|
||||
Reference in New Issue
Block a user