mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-23 03:57:48 +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:
@@ -13,7 +13,8 @@
|
||||
var/custombasedesc = null
|
||||
var/custombasecolor = null
|
||||
|
||||
/obj/effect/decal/cleanable/blood/reagent/New(var/spill_name, var/spill_color, var/spill_reagentid, var/new_amount, var/ckey_user, var/ckey_spawn)
|
||||
/obj/effect/decal/cleanable/blood/reagent/Initialize(mapload, var/spill_name, var/spill_color, var/spill_reagentid, var/new_amount, var/ckey_user, var/ckey_spawn)
|
||||
. = ..()
|
||||
switch(spill_reagentid) //To ensure that if people spill some liquids, it wont cause issues with spawning, like spilling blood. Also allow for spilling of certain things to
|
||||
if("blood")
|
||||
return
|
||||
|
||||
@@ -18,14 +18,14 @@
|
||||
|
||||
var/poster_type = /obj/structure/sign/poster
|
||||
|
||||
/obj/item/contraband/poster/New(turf/loc, var/given_serial = 0)
|
||||
/obj/item/contraband/poster/Initialize(mapload, var/given_serial = 0)
|
||||
if(!serial_number)
|
||||
if(given_serial == 0)
|
||||
serial_number = rand(1, poster_designs.len)
|
||||
else
|
||||
serial_number = given_serial
|
||||
name += " - No. [serial_number]"
|
||||
..(loc)
|
||||
. = ..()
|
||||
|
||||
//Places the poster on a wall
|
||||
/obj/item/contraband/poster/afterattack(var/atom/A, var/mob/user, var/adjacent, var/clickparams)
|
||||
@@ -83,12 +83,12 @@
|
||||
icon_state = "rolled_poster_nt"
|
||||
poster_type = /obj/structure/sign/poster/nanotrasen
|
||||
|
||||
/obj/item/contraband/poster/nanotrasen/New(turf/loc, var/given_serial = 0)
|
||||
/obj/item/contraband/poster/nanotrasen/Initialize(mapload, var/given_serial = 0)
|
||||
if(given_serial == 0)
|
||||
serial_number = rand(1, NT_poster_designs.len)
|
||||
else
|
||||
serial_number = given_serial
|
||||
..(loc)
|
||||
. = ..()
|
||||
|
||||
//Selectable subtype
|
||||
/obj/item/contraband/poster/custom
|
||||
@@ -96,12 +96,12 @@
|
||||
desc = "The poster comes with its own automatic adhesive mechanism, for easy pinning to any vertical surface. This one is made from some kind of e-paper, and could display almost anything!"
|
||||
poster_type = /obj/structure/sign/poster/custom
|
||||
|
||||
/obj/item/contraband/poster/custom/New(turf/loc, var/given_serial = 0)
|
||||
/obj/item/contraband/poster/custom/Initialize(mapload, var/given_serial = 0)
|
||||
if(given_serial == 0)
|
||||
serial_number = 1 //Decidedly unrandom
|
||||
else
|
||||
serial_number = given_serial
|
||||
..(loc)
|
||||
. = ..()
|
||||
|
||||
/obj/item/contraband/poster/custom/verb/select_poster()
|
||||
set name = "Set Poster type"
|
||||
@@ -137,8 +137,8 @@
|
||||
var/roll_type
|
||||
var/poster_set = FALSE
|
||||
|
||||
/obj/structure/sign/poster/New(var/newloc, var/placement_dir=null, var/serial=null, var/itemtype = /obj/item/contraband/poster)
|
||||
..(newloc)
|
||||
/obj/structure/sign/poster/Initialize(mapload, var/placement_dir=null, var/serial=null, var/itemtype = /obj/item/contraband/poster)
|
||||
. = ..()
|
||||
|
||||
if(!serial)
|
||||
serial = rand(1, poster_designs.len) //use a random serial if none is given
|
||||
@@ -226,7 +226,7 @@
|
||||
/obj/structure/sign/poster/nanotrasen
|
||||
roll_type = /obj/item/contraband/poster/nanotrasen
|
||||
|
||||
/obj/structure/sign/poster/nanotrasen/New(var/newloc, var/placement_dir=null, var/serial=null, var/itemtype = /obj/item/contraband/poster/nanotrasen)
|
||||
/obj/structure/sign/poster/nanotrasen/Initialize(mapload, var/placement_dir=null, var/serial=null, var/itemtype = /obj/item/contraband/poster/nanotrasen)
|
||||
if(!serial)
|
||||
serial = rand(1, NT_poster_designs.len)
|
||||
|
||||
@@ -234,7 +234,7 @@
|
||||
var/datum/poster/design = NT_poster_designs[serial_number]
|
||||
set_poster(design)
|
||||
|
||||
..(newloc, placement_dir, serial, itemtype)
|
||||
. = ..(mapload, placement_dir, serial, itemtype)
|
||||
|
||||
//Non-Random Posters
|
||||
|
||||
|
||||
@@ -71,13 +71,13 @@
|
||||
delete_me = TRUE
|
||||
//VORE Station Add End
|
||||
|
||||
landmarks_list += src
|
||||
|
||||
if(delete_me)
|
||||
return INITIALIZE_HINT_QDEL
|
||||
else
|
||||
landmarks_list += src
|
||||
|
||||
/obj/effect/landmark/Destroy(var/force = FALSE)
|
||||
if(delete_me || force)
|
||||
if(force)
|
||||
landmarks_list -= src
|
||||
return ..()
|
||||
return QDEL_HINT_LETMELIVE
|
||||
|
||||
@@ -44,14 +44,14 @@
|
||||
name = "TTV bomb - proximity"
|
||||
assembly_type = /obj/item/assembly/prox_sensor
|
||||
|
||||
/obj/effect/spawner/newbomb/radio/custom/New(var/newloc, ph, ox, co)
|
||||
/obj/effect/spawner/newbomb/radio/custom/Initialize(mapload, ph, ox, co)
|
||||
if(ph != null) phoron_amt = ph
|
||||
if(ox != null) oxygen_amt = ox
|
||||
if(co != null) carbon_amt = co
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/effect/spawner/newbomb/Initialize(mapload)
|
||||
..()
|
||||
. = ..()
|
||||
var/obj/item/transfer_valve/V = new(src.loc)
|
||||
var/obj/item/tank/phoron/PT = new(V)
|
||||
var/obj/item/tank/oxygen/OT = new(V)
|
||||
@@ -100,8 +100,8 @@
|
||||
var/phoron_amt = 0
|
||||
var/oxygen_amt = 0
|
||||
|
||||
/obj/effect/spawner/onetankbomb/New(newloc) //just needs an assembly.
|
||||
..(newloc)
|
||||
/obj/effect/spawner/onetankbomb/Initialize(mapload) //just needs an assembly.
|
||||
. = ..()
|
||||
|
||||
var/type = pick(/obj/item/tank/phoron/onetankbomb, /obj/item/tank/oxygen/onetankbomb)
|
||||
new type(src.loc)
|
||||
@@ -116,8 +116,8 @@
|
||||
// var/assembly_type = /obj/item/assembly/signaler
|
||||
|
||||
//Note that the maximum amount of gas you can put in a 70L air tank at 1013.25 kPa and 519K is 16.44 mol.
|
||||
/obj/effect/spawner/onetankbomb/full/New(newloc) //just needs an assembly.
|
||||
..(newloc)
|
||||
/obj/effect/spawner/onetankbomb/full/Initialize(mapload) //just needs an assembly.
|
||||
. = ..()
|
||||
|
||||
var/type = pick(/obj/item/tank/phoron/onetankbomb/full, /obj/item/tank/oxygen/onetankbomb/full)
|
||||
new type(src.loc)
|
||||
@@ -132,8 +132,8 @@
|
||||
// var/assembly_type = /obj/item/assembly/signaler
|
||||
|
||||
//Note that the maximum amount of gas you can put in a 70L air tank at 1013.25 kPa and 519K is 16.44 mol.
|
||||
/obj/effect/spawner/onetankbomb/full/New(newloc) //just needs an assembly.
|
||||
..(newloc)
|
||||
/obj/effect/spawner/onetankbomb/full/Initialize(mapload) //just needs an assembly.
|
||||
. = ..()
|
||||
|
||||
var/type = pick(/obj/item/tank/phoron/onetankbomb/full, /obj/item/tank/oxygen/onetankbomb/full)
|
||||
new type(src.loc)
|
||||
|
||||
@@ -287,7 +287,7 @@ But for now, for what it's been used for, it works.
|
||||
return
|
||||
if(Mtarget)
|
||||
H.forceMove(Mtarget.loc)
|
||||
var/obj/locker = new /obj/structure/closet/secure_closet/mind(target.loc, mind_target = H.mind)
|
||||
var/obj/locker = new /obj/structure/closet/secure_closet/mind(target.loc, H.mind)
|
||||
for(var/obj/item/W in H)
|
||||
if(istype(W, /obj/item/implant/backup || istype(W, /obj/item/nif)))
|
||||
continue
|
||||
@@ -345,5 +345,6 @@ But for now, for what it's been used for, it works.
|
||||
name = "Autostrip target to send mobs to."
|
||||
|
||||
/obj/effect/autostriptarget/mob/Initialize(mapload)
|
||||
. = ..()
|
||||
if(targetid)
|
||||
GLOB.mapped_autostrips_mob[targetid] = src
|
||||
|
||||
Reference in New Issue
Block a user