cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-16 09:34:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Finish Machinery new to init (#17334)

Browse Source 
* Finish Machinery new to init

* fix that

---------

Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
Kashargul
2025-03-16 08:57:48 +01:00
committed by GitHub
parent f362f6585f
commit 4d36cfdaeb
116 changed files with 486 additions and 528 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/alien/aliens.dm
+2 -2
View File
@@ -252,8 +252,8 @@
var/ticks = 0
var/target_strength = 0
/obj/effect/alien/acid/New(loc, target)
..(loc)
/obj/effect/alien/acid/Initialize(mapload, target)
. = ..()
src.target = target
if(isturf(target)) // Turf take twice as long to take down.
code/game/objects/effects/landmarks_poi_vr.dm
-1
View File
@@ -9,7 +9,6 @@ var/global/list/global_used_pois = list()
var/poi_type = null
var/remove_from_pool = TRUE
/obj/effect/landmark/poi_loader/New()
INITIALIZE_IMMEDIATE(/obj/effect/landmark/poi_loader)
/obj/effect/landmark/poi_loader/Initialize(mapload)
code/game/objects/items/antag_spawners.dm
+2 -2
View File
@@ -6,8 +6,8 @@
var/datum/effect/effect/system/spark_spread/sparks
var/datum/ghost_query/Q //This is used so we can unregister ourself.
/obj/item/antag_spawner/New()
..()
/obj/item/antag_spawner/Initialize(mapload)
. = ..()
sparks = new /datum/effect/effect/system/spark_spread()
sparks.set_up(5, 0, src)
sparks.attach(loc)
code/game/objects/items/devices/body_snatcher_vr.dm
+1 -4
View File
@@ -11,10 +11,7 @@
origin_tech = list(TECH_MAGNET = 2, TECH_BIO = 2, TECH_ILLEGAL = 1)
pickup_sound = 'sound/items/pickup/device.ogg'
drop_sound = 'sound/items/drop/device.ogg'
/obj/item/bodysnatcher/New()
..()
flags |= NOBLUDGEON //So borgs don't spark.
flags = NOBLUDGEON
/obj/item/bodysnatcher/attack(mob/living/M, mob/living/user)
user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
code/game/objects/items/devices/communicator/communicator.dm
+2 -2
View File
@@ -349,8 +349,8 @@ var/global/list/obj/item/communicator/all_communicators = list()
/obj/machinery/camera/communicator
network = list(NETWORK_COMMUNICATORS)
/obj/machinery/camera/communicator/New()
..()
/obj/machinery/camera/communicator/Initialize(mapload)
. = ..()
client_huds |= global_hud.whitense
client_huds |= global_hud.darkMask
code/game/objects/items/devices/laserpointer.dm
+8 -8
View File
@@ -31,17 +31,17 @@
/obj/item/laser_pointer/purple
pointer_icon_state = "purple_laser"
/obj/item/laser_pointer/New()
..()
diode = new(src)
/obj/item/laser_pointer/Initialize(mapload, var/laser_path)
. = ..()
if(ispath(laser_path))
diode = new laser_path
else
diode = new(src)
if(!pointer_icon_state)
pointer_icon_state = pick("red_laser","green_laser","blue_laser","purple_laser")
/obj/item/laser_pointer/upgraded/New()
..()
diode = new /obj/item/stock_parts/micro_laser/ultra
/obj/item/laser_pointer/upgraded/Initialize(mapload)
. = ..(mapload, /obj/item/stock_parts/micro_laser/ultra)
/obj/item/laser_pointer/attack(mob/living/M, mob/user)
laser_act(M, user)
code/game/objects/items/devices/lightreplacer.dm
+2 -6
View File
@@ -56,9 +56,9 @@
pickup_sound = 'sound/items/pickup/device.ogg'
drop_sound = 'sound/items/drop/device.ogg'
/obj/item/lightreplacer/New()
/obj/item/lightreplacer/Initialize(mapload)
. = ..()
failmsg = "The [name]'s refill light blinks red."
..()
/obj/item/lightreplacer/examine(mob/user)
. = ..()
@@ -241,10 +241,6 @@
var/dimming = 0.7 // multiply value to dim lights from setcolor to nightcolor
/obj/item/lightpainter/New()
. = ..()
/obj/item/lightpainter/examine(mob/user)
. = ..()
if(get_dist(user, src) <= 2)
code/game/objects/items/devices/scanners/mass_spectrometer.dm
+2 -2
View File
@@ -19,8 +19,8 @@
pickup_sound = 'sound/items/pickup/device.ogg'
drop_sound = 'sound/items/drop/device.ogg'
/obj/item/mass_spectrometer/New()
..()
/obj/item/mass_spectrometer/Initialize(mapload)
. = ..()
var/datum/reagents/R = new/datum/reagents(5)
reagents = R
R.my_atom = src
code/game/objects/items/devices/spy_bug.dm
+7 -7
View File
@@ -20,8 +20,8 @@
pickup_sound = 'sound/items/pickup/device.ogg'
drop_sound = 'sound/items/drop/device.ogg'
/obj/item/camerabug/New()
..()
/obj/item/camerabug/Initialize(mapload)
. = ..()
// radio = new(src)
camera = new camtype(src)
@@ -168,7 +168,7 @@
drop_sound = 'sound/items/drop/device.ogg'
/*
/obj/item/bug_monitor/New()
/obj/item/bug_monitor/Initialize(mapload)
radio = new(src)
*/
/obj/item/bug_monitor/attack_self(mob/user)
@@ -252,8 +252,8 @@
/obj/machinery/camera/bug
network = list(NETWORK_SECURITY)
/obj/machinery/camera/bug/New()
..()
/obj/machinery/camera/bug/Initialize(mapload)
. = ..()
name = "Camera #[rand(1000,9999)]"
c_tag = name
@@ -261,8 +261,8 @@
// These cheap toys are accessible from the mercenary camera console as well - only the antag ones though!
network = list(NETWORK_MERCENARY)
/obj/machinery/camera/bug/spy/New()
..()
/obj/machinery/camera/bug/spy/Initialize(mapload)
. = ..()
name = "DV-136ZB #[rand(1000,9999)]"
c_tag = name
code/game/objects/items/pizza_voucher_vr.dm
+2 -2
View File
@@ -7,8 +7,8 @@
var/special_delivery = FALSE
w_class = ITEMSIZE_SMALL
/obj/item/pizzavoucher/New()
..()
/obj/item/pizzavoucher/Initialize(mapload)
. = ..()
var/list/descstrings = list("24/7 PIZZA PIE HEAVEN",
"WE ALWAYS DELIVER!",
"24-HOUR PIZZA PIE POWER!",
code/game/objects/items/weapons/chewables.dm
+1 -1
View File
@@ -172,11 +172,11 @@
var/closed_state
/obj/item/storage/box/fancy/chewables/tobacco/nico/Initialize(mapload)
. = ..()
if(!open_state)
open_state = "[initial(icon_state)]0"
if(!closed_state)
closed_state = "[initial(icon_state)]"
. = ..()
/obj/item/storage/box/fancy/chewables/tobacco/nico/update_icon()
cut_overlays()
code/game/objects/items/weapons/implants/implant.dm
+2 -2
View File
@@ -373,8 +373,8 @@ Can only be loaded while still in its original case.<BR>
the implant may become unstable and either pre-maturely inject the subject or simply break."}
return dat
/obj/item/implant/chem/New()
..()
/obj/item/implant/chem/Initialize(mapload)
. = ..()
var/datum/reagents/R = new/datum/reagents(50)
reagents = R
R.my_atom = src
code/game/objects/items/weapons/implants/implantchair.dm
+2 -2
View File
@@ -19,8 +19,8 @@
var/mob/living/carbon/occupant = null
var/injecting = 0
/obj/machinery/implantchair/New()
..()
/obj/machinery/implantchair/Initialize(mapload)
. = ..()
add_implants()
code/game/objects/items/weapons/storage/fancy.dm
+3 -3
View File
@@ -62,11 +62,11 @@
starts_with = list(/obj/item/reagent_containers/food/snacks/egg = 12)
/obj/item/storage/fancy/egg_box/Initialize(mapload)
. = ..()
if(!open_state)
open_state = "[initial(icon_state)]0"
if(!closed_state)
closed_state = "[initial(icon_state)]"
. = ..()
/obj/item/storage/fancy/egg_box/update_icon()
cut_overlays()
@@ -264,11 +264,11 @@
C.desc += " This one is \a [brand]."
/obj/item/storage/fancy/cigarettes/Initialize(mapload)
. = ..()
if(!open_state)
open_state = "[initial(icon_state)]_open"
if(!closed_state)
closed_state = "[initial(icon_state)]"
. = ..()
/obj/item/storage/fancy/cigarettes/update_icon()
cut_overlays()
@@ -411,11 +411,11 @@
return ..()
/obj/item/storage/fancy/cigar/Initialize(mapload)
. = ..()
if(!open_state)
open_state = "[initial(icon_state)]0"
if(!closed_state)
closed_state = "[initial(icon_state)]"
. = ..()
/obj/item/storage/fancy/cigar/update_icon()
cut_overlays()
code/game/objects/items/weapons/storage/storage.dm
+1 -1
View File
@@ -813,11 +813,11 @@
icon_state = closed_state
/obj/item/storage/trinketbox/Initialize(mapload)
. = ..()
if(!open_state)
open_state = "[initial(icon_state)]_open"
if(!closed_state)
closed_state = "[initial(icon_state)]"
. = ..()
/obj/item/storage/trinketbox/attack_self()
open = !open