/atom New() => Initialize() [MDB IGNORE]

This commit is contained in:
MistakeNot4892
2021-11-14 03:09:51 -05:00
committed by VirgoBot
parent 47c8115916
commit 3f9af78f3a
587 changed files with 12315 additions and 2669 deletions
+2 -2
View File
@@ -16,8 +16,8 @@
var/footer = null
var/footerOn = FALSE
/obj/item/weapon/paper/admin/New()
..()
/obj/item/weapon/paper/admin/Initialize()
. = ..()
generateInteractions()
+2 -1
View File
@@ -12,7 +12,8 @@
var/obj/item/weapon/toppaper //The topmost piece of paper.
slot_flags = SLOT_BELT
/obj/item/weapon/clipboard/New()
/obj/item/weapon/clipboard/Initialize()
. = ..()
update_icon()
/obj/item/weapon/clipboard/MouseDrop(obj/over_object as obj) //Quick clipboard fix. -Agouri
+2 -2
View File
@@ -25,12 +25,12 @@ var/list/adminfaxes = list() //cache for faxes that have been sent to admins
var/department = "Unknown" // our department
var/destination = null // the department we're sending to
/obj/machinery/photocopier/faxmachine/New()
/obj/machinery/photocopier/faxmachine/Initialize()
allfaxes += src
if(!destination) destination = "[using_map.boss_name]"
if( !(("[department]" in alldepartments) || ("[department]" in admin_departments)) )
alldepartments |= department
..()
. = ..()
/obj/machinery/photocopier/faxmachine/attack_hand(mob/user as mob)
user.set_machine(src)
+2 -1
View File
@@ -40,7 +40,8 @@
desc = "A white folder with RD markings."
icon_state = "folder_rd"
/obj/item/weapon/folder/white_rd/New()
/obj/item/weapon/folder/white_rd/Initialize()
. = ..()
//add some memos
var/obj/item/weapon/paper/P = new()
P.name = "Memo RE: proper analysis procedure"
+13 -7
View File
@@ -74,8 +74,8 @@
desc = "A gift card with a heart on the cover."
icon_state = "greetingcard_heart"
/obj/item/weapon/paper/card/New()
..()
/obj/item/weapon/paper/card/Initialize()
. = ..()
pixel_y = rand(-8, 8)
pixel_x = rand(-9, 9)
stamps = null
@@ -112,11 +112,19 @@
if(mapload) // Jank, but we do this to prevent maploaded papers from somehow stacking across rounds if re-added to the board by a player.
was_maploaded = TRUE
<<<<<<< HEAD
/obj/item/weapon/paper/New(var/newloc, var/text, var/title)
..()
=======
/obj/item/weapon/paper/Initialize()
. = ..()
>>>>>>> 2f0a618d451... /atom New() => Initialize() [MDB IGNORE] (#8298)
pixel_y = rand(-8, 8)
pixel_x = rand(-9, 9)
stamps = ""
addtimer(CALLBACK(src, .proc/update_info), 0)
/obj/item/weapon/paper/proc/update_info()
if(!isnull(title))
name = title
@@ -132,11 +140,9 @@
info = replacetext(info, "\n", "<BR>")
info = parsepencode(info)
spawn(2)
update_icon()
update_space(info)
updateinfolinks()
return
update_icon()
update_space(info)
updateinfolinks()
/obj/item/weapon/paper/update_icon()
if(icon_state == "paper_talisman")
+1 -1
View File
@@ -11,7 +11,7 @@
var/obj/item/weapon/paper/internalPaper
/obj/item/weapon/paperplane/New(loc, obj/item/weapon/paper/newPaper)
/obj/item/weapon/paperplane/Initialize(var/ml, obj/item/weapon/paper/newPaper)
. = ..()
pixel_y = rand(-8, 8)
pixel_x = rand(-9, 9)
+2 -2
View File
@@ -149,8 +149,8 @@
throw_range = 3
throw_speed = 1
/obj/item/weapon/shreddedp/New()
..()
/obj/item/weapon/shreddedp/Initialize()
. = ..()
pixel_x = rand(-5,5)
pixel_y = rand(-5,5)
if(prob(65)) color = pick("#BABABA","#7F7F7F")
+14 -6
View File
@@ -95,8 +95,8 @@
flags = OPENCONTAINER
origin_tech = list(TECH_MATERIAL = 2, TECH_ILLEGAL = 5)
/obj/item/weapon/pen/reagent/New()
..()
/obj/item/weapon/pen/reagent/Initialize()
. = ..()
create_reagents(30)
/obj/item/weapon/pen/reagent/attack(mob/living/M as mob, mob/user as mob)
@@ -212,10 +212,16 @@
desc = "It's a black ink pen with a sharp point and a carefully engraved \"Waffle Co.\""
origin_tech = list(TECH_MATERIAL = 2, TECH_ILLEGAL = 5)
<<<<<<< HEAD
/obj/item/weapon/pen/reagent/sleepy/New()
..()
reagents.add_reagent("chloralhydrate", 1) //VOREStation Edit
reagents.add_reagent("stoxin", 14) //VOREStation Add
=======
/obj/item/weapon/pen/reagent/sleepy/Initialize()
. = ..()
reagents.add_reagent("chloralhydrate", 22) //Used to be 100 sleep toxin//30 Chloral seems to be fatal, reducing it to 22./N
>>>>>>> 2f0a618d451... /atom New() => Initialize() [MDB IGNORE] (#8298)
/*
@@ -224,8 +230,8 @@
/obj/item/weapon/pen/reagent/paralysis
origin_tech = list(TECH_MATERIAL = 2, TECH_ILLEGAL = 5)
/obj/item/weapon/pen/reagent/paralysis/New()
..()
/obj/item/weapon/pen/reagent/paralysis/Initialize()
. = ..()
reagents.add_reagent("zombiepowder", 5)
reagents.add_reagent("cryptobiolin", 10)
@@ -304,7 +310,8 @@
drop_sound = 'sound/items/drop/gloves.ogg'
pickup_sound = 'sound/items/pickup/gloves.ogg'
/obj/item/weapon/pen/crayon/New()
/obj/item/weapon/pen/crayon/Initialize()
. = ..()
name = "[colourName] crayon"
/obj/item/weapon/pen/crayon/marker
@@ -312,5 +319,6 @@
desc = "A chisel-tip permanent marker. Hopefully non-toxic."
icon_state = "markerred"
/obj/item/weapon/pen/crayon/marker/New()
/obj/item/weapon/pen/crayon/marker/Initialize()
. = ..()
name = "[colourName] marker"
+2 -3
View File
@@ -37,11 +37,10 @@ var/global/photo_count = 0
var/icon/tiny
var/photo_size = 3
/obj/item/weapon/photo/New()
/obj/item/weapon/photo/Initialize()
. = ..()
id = photo_count++
/obj/item/weapon/photo/attack_self(mob/user as mob)
user.examinate(src)