mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-07-20 19:44:46 +01:00
New to init final (#17512)
* Initial * some more * next few * only light left * fix things up * some rmore fixes * guh * Update ai_vr.dm * comment * lets try something * . * hmm * . * . * hmm * push that here * fix layout * grrr
This commit is contained in:
@@ -16,8 +16,8 @@
|
||||
var/footer = null
|
||||
var/footerOn = FALSE
|
||||
|
||||
/obj/item/paper/admin/New()
|
||||
..()
|
||||
/obj/item/paper/admin/Initialize(mapload, text, title)
|
||||
. = ..()
|
||||
generateInteractions()
|
||||
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
var/obj/item/paper/internalPaper
|
||||
|
||||
/obj/item/paperplane/New(loc, obj/item/paper/newPaper)
|
||||
/obj/item/paperplane/Initialize(mapload, obj/item/paper/newPaper)
|
||||
. = ..()
|
||||
pixel_y = rand(-8, 8)
|
||||
pixel_x = rand(-9, 9)
|
||||
|
||||
@@ -131,8 +131,8 @@
|
||||
flags = OPENCONTAINER
|
||||
origin_tech = list(TECH_MATERIAL = 2, TECH_ILLEGAL = 5)
|
||||
|
||||
/obj/item/pen/reagent/New()
|
||||
..()
|
||||
/obj/item/pen/reagent/Initialize(mapload)
|
||||
. = ..()
|
||||
create_reagents(30)
|
||||
|
||||
/obj/item/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/pen/reagent/sleepy/New()
|
||||
..()
|
||||
/obj/item/pen/reagent/sleepy/Initialize(mapload)
|
||||
. = ..()
|
||||
reagents.add_reagent(REAGENT_ID_CHLORALHYDRATE, 1) //VOREStation Edit
|
||||
reagents.add_reagent(REAGENT_ID_STOXIN, 14) //VOREStation Add
|
||||
|
||||
@@ -259,8 +259,8 @@
|
||||
/obj/item/pen/reagent/paralysis
|
||||
origin_tech = list(TECH_MATERIAL = 2, TECH_ILLEGAL = 5)
|
||||
|
||||
/obj/item/pen/reagent/paralysis/New()
|
||||
..()
|
||||
/obj/item/pen/reagent/paralysis/Initialize(mapload)
|
||||
. = ..()
|
||||
reagents.add_reagent(REAGENT_ID_ZOMBIEPOWDER, 5)
|
||||
reagents.add_reagent(REAGENT_ID_CRYPTOBIOLIN, 10)
|
||||
|
||||
@@ -338,13 +338,11 @@
|
||||
drop_sound = 'sound/items/drop/gloves.ogg'
|
||||
pickup_sound = 'sound/items/pickup/gloves.ogg'
|
||||
|
||||
/obj/item/pen/crayon/New()
|
||||
name = "[colourName] crayon"
|
||||
/obj/item/pen/crayon/Initialize(mapload)
|
||||
. = ..()
|
||||
name = "[colourName] [name]"
|
||||
|
||||
/obj/item/pen/crayon/marker
|
||||
name = "marker"
|
||||
desc = "A chisel-tip permanent marker. Hopefully non-toxic."
|
||||
icon_state = "markerred"
|
||||
|
||||
/obj/item/pen/crayon/marker/New()
|
||||
name = "[colourName] marker"
|
||||
|
||||
Reference in New Issue
Block a user