mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-19 02:54:41 +01:00
Convert most of /obj/machinery to use Initialize rather than New (#17845)
* Switch a bunch of /obj/machinery from /New to /Initialize This is an easy and uncontroversial batch. No globs, no late init, and stuff. * Move more machinery to Initialize This time the ones dealing with GLOB vars, as well as some simpler ones i missed previously. * More tricky New -> Initialize migrations * The last of machinery Initialize conversion * fixups * Newscaster armor fix * styling * Comment on armor handling * Move newscaster armor definition back to datum * farie82 review * kill extra .= Co-authored-by: Farie82 <farie82@users.noreply.github.com> * farie's review part 2 Co-authored-by: Farie82 <farie82@users.noreply.github.com> Co-authored-by: Farie82 <farie82@users.noreply.github.com>
This commit is contained in:
@@ -114,14 +114,14 @@
|
||||
// NEW() PROCS //
|
||||
//////////////////////////////
|
||||
|
||||
/obj/machinery/fishtank/New()
|
||||
..()
|
||||
/obj/machinery/fishtank/Initialize(mapload)
|
||||
. = ..()
|
||||
if(!has_lid) //Tank doesn't have a lid/light, remove the verbs for then
|
||||
verbs -= /obj/machinery/fishtank/verb/toggle_lid_verb
|
||||
verbs -= /obj/machinery/fishtank/verb/toggle_light_verb
|
||||
|
||||
/obj/machinery/fishtank/tank/New()
|
||||
..()
|
||||
/obj/machinery/fishtank/tank/Initialize(mapload)
|
||||
. = ..()
|
||||
if(prob(5)) //5% chance to get the castle decoration
|
||||
icon_state = "tank2"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user