mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-22 19:47:47 +01:00
Revert "[MIRROR] /atom New() => Initialize() [MDB IGNORE]"
This commit is contained in:
@@ -16,8 +16,8 @@
|
||||
var/footer = null
|
||||
var/footerOn = FALSE
|
||||
|
||||
/obj/item/weapon/paper/admin/Initialize()
|
||||
. = ..()
|
||||
/obj/item/weapon/paper/admin/New()
|
||||
..()
|
||||
generateInteractions()
|
||||
|
||||
|
||||
|
||||
@@ -12,8 +12,7 @@
|
||||
var/obj/item/weapon/toppaper //The topmost piece of paper.
|
||||
slot_flags = SLOT_BELT
|
||||
|
||||
/obj/item/weapon/clipboard/Initialize()
|
||||
. = ..()
|
||||
/obj/item/weapon/clipboard/New()
|
||||
update_icon()
|
||||
|
||||
/obj/item/weapon/clipboard/MouseDrop(obj/over_object as obj) //Quick clipboard fix. -Agouri
|
||||
|
||||
@@ -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/Initialize()
|
||||
/obj/machinery/photocopier/faxmachine/New()
|
||||
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)
|
||||
|
||||
@@ -40,8 +40,7 @@
|
||||
desc = "A white folder with RD markings."
|
||||
icon_state = "folder_rd"
|
||||
|
||||
/obj/item/weapon/folder/white_rd/Initialize()
|
||||
. = ..()
|
||||
/obj/item/weapon/folder/white_rd/New()
|
||||
//add some memos
|
||||
var/obj/item/weapon/paper/P = new()
|
||||
P.name = "Memo RE: proper analysis procedure"
|
||||
|
||||
@@ -74,8 +74,8 @@
|
||||
desc = "A gift card with a heart on the cover."
|
||||
icon_state = "greetingcard_heart"
|
||||
|
||||
/obj/item/weapon/paper/card/Initialize()
|
||||
. = ..()
|
||||
/obj/item/weapon/paper/card/New()
|
||||
..()
|
||||
pixel_y = rand(-8, 8)
|
||||
pixel_x = rand(-9, 9)
|
||||
stamps = null
|
||||
@@ -107,32 +107,41 @@
|
||||
//lipstick wiping is in code/game/objects/items/weapons/cosmetics.dm!
|
||||
|
||||
/obj/item/weapon/paper/Initialize(mapload, var/text, var/title)
|
||||
. = ..()
|
||||
. = ..()
|
||||
|
||||
if(istext(title))
|
||||
name = title
|
||||
if(istext(text))
|
||||
info = text
|
||||
if(istext(title))
|
||||
name = title
|
||||
if(istext(text))
|
||||
info = text
|
||||
|
||||
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
|
||||
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
|
||||
|
||||
/obj/item/weapon/paper/New(var/newloc, var/text, var/title)
|
||||
..()
|
||||
pixel_y = rand(-8, 8)
|
||||
pixel_x = rand(-9, 9)
|
||||
stamps = ""
|
||||
|
||||
/obj/item/weapon/paper/proc/update_info()
|
||||
if(!isnull(title))
|
||||
name = title
|
||||
|
||||
if(name != "paper")
|
||||
desc = "This is a paper titled '" + name + "'."
|
||||
|
||||
if(!isnull(text))
|
||||
info = text
|
||||
|
||||
if(info != initial(info))
|
||||
info = html_encode(info)
|
||||
info = replacetext(info, "\n", "<BR>")
|
||||
info = parsepencode(info)
|
||||
|
||||
update_icon()
|
||||
update_space(info)
|
||||
updateinfolinks()
|
||||
spawn(2)
|
||||
update_icon()
|
||||
update_space(info)
|
||||
updateinfolinks()
|
||||
return
|
||||
|
||||
/obj/item/weapon/paper/update_icon()
|
||||
if(icon_state == "paper_talisman")
|
||||
@@ -425,7 +434,7 @@
|
||||
var/raw = tgui_input_text(usr, "Enter what you want to write:", "Write", multiline = TRUE, prevent_enter = TRUE)
|
||||
if(!raw)
|
||||
return
|
||||
|
||||
|
||||
var/t = sanitize(raw, MAX_PAPER_MESSAGE_LEN, extra = 0)
|
||||
if(!t)
|
||||
return
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
var/obj/item/weapon/paper/internalPaper
|
||||
|
||||
/obj/item/weapon/paperplane/Initialize(var/ml, obj/item/weapon/paper/newPaper)
|
||||
/obj/item/weapon/paperplane/New(loc, obj/item/weapon/paper/newPaper)
|
||||
. = ..()
|
||||
pixel_y = rand(-8, 8)
|
||||
pixel_x = rand(-9, 9)
|
||||
|
||||
@@ -149,8 +149,8 @@
|
||||
throw_range = 3
|
||||
throw_speed = 1
|
||||
|
||||
/obj/item/weapon/shreddedp/Initialize()
|
||||
. = ..()
|
||||
/obj/item/weapon/shreddedp/New()
|
||||
..()
|
||||
pixel_x = rand(-5,5)
|
||||
pixel_y = rand(-5,5)
|
||||
if(prob(65)) color = pick("#BABABA","#7F7F7F")
|
||||
|
||||
@@ -131,8 +131,8 @@
|
||||
flags = OPENCONTAINER
|
||||
origin_tech = list(TECH_MATERIAL = 2, TECH_ILLEGAL = 5)
|
||||
|
||||
/obj/item/weapon/pen/reagent/Initialize()
|
||||
. = ..()
|
||||
/obj/item/weapon/pen/reagent/New()
|
||||
..()
|
||||
create_reagents(30)
|
||||
|
||||
/obj/item/weapon/pen/reagent/attack(mob/living/M as mob, mob/user as mob)
|
||||
@@ -247,8 +247,8 @@
|
||||
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)
|
||||
|
||||
/obj/item/weapon/pen/reagent/sleepy/Initialize()
|
||||
. = ..()
|
||||
/obj/item/weapon/pen/reagent/sleepy/New()
|
||||
..()
|
||||
reagents.add_reagent("chloralhydrate", 1) //VOREStation Edit
|
||||
reagents.add_reagent("stoxin", 14) //VOREStation Add
|
||||
|
||||
@@ -259,8 +259,8 @@
|
||||
/obj/item/weapon/pen/reagent/paralysis
|
||||
origin_tech = list(TECH_MATERIAL = 2, TECH_ILLEGAL = 5)
|
||||
|
||||
/obj/item/weapon/pen/reagent/paralysis/Initialize()
|
||||
. = ..()
|
||||
/obj/item/weapon/pen/reagent/paralysis/New()
|
||||
..()
|
||||
reagents.add_reagent("zombiepowder", 5)
|
||||
reagents.add_reagent("cryptobiolin", 10)
|
||||
|
||||
@@ -338,8 +338,7 @@
|
||||
drop_sound = 'sound/items/drop/gloves.ogg'
|
||||
pickup_sound = 'sound/items/pickup/gloves.ogg'
|
||||
|
||||
/obj/item/weapon/pen/crayon/Initialize()
|
||||
. = ..()
|
||||
/obj/item/weapon/pen/crayon/New()
|
||||
name = "[colourName] crayon"
|
||||
|
||||
/obj/item/weapon/pen/crayon/marker
|
||||
@@ -347,6 +346,5 @@
|
||||
desc = "A chisel-tip permanent marker. Hopefully non-toxic."
|
||||
icon_state = "markerred"
|
||||
|
||||
/obj/item/weapon/pen/crayon/marker/Initialize()
|
||||
. = ..()
|
||||
/obj/item/weapon/pen/crayon/marker/New()
|
||||
name = "[colourName] marker"
|
||||
|
||||
@@ -37,10 +37,11 @@ var/global/photo_count = 0
|
||||
var/icon/tiny
|
||||
var/photo_size = 3
|
||||
|
||||
/obj/item/weapon/photo/Initialize()
|
||||
. = ..()
|
||||
/obj/item/weapon/photo/New()
|
||||
id = photo_count++
|
||||
|
||||
|
||||
|
||||
/obj/item/weapon/photo/attack_self(mob/user as mob)
|
||||
user.examinate(src)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user