mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-25 04:57:47 +01:00
Finish Machinery new to init (#17334)
* Finish Machinery new to init * fix that --------- Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
co-authored by
Cameron Lennox
parent
f362f6585f
commit
4d36cfdaeb
@@ -18,8 +18,8 @@
|
||||
)
|
||||
|
||||
//Forces different sprite sheet on equip
|
||||
/obj/item/clothing/accessory/choker/New()
|
||||
..()
|
||||
/obj/item/clothing/accessory/choker/Initialize(mapload)
|
||||
. = ..()
|
||||
icon_previous_override = icon_override
|
||||
|
||||
/obj/item/clothing/accessory/choker/equipped() //Solution for race-specific sprites for an accessory which is also a suit. Suit icons break if you don't use icon override which then also overrides race-specific sprites.
|
||||
@@ -57,8 +57,8 @@
|
||||
)
|
||||
|
||||
//Forces different sprite sheet on equip
|
||||
/obj/item/clothing/accessory/collar/New()
|
||||
..()
|
||||
/obj/item/clothing/accessory/collar/Initialize(mapload)
|
||||
. = ..()
|
||||
icon_previous_override = icon_override
|
||||
|
||||
/obj/item/clothing/accessory/collar/equipped() //Solution for race-specific sprites for an accessory which is also a suit. Suit icons break if you don't use icon override which then also overrides race-specific sprites.
|
||||
|
||||
@@ -11,8 +11,8 @@
|
||||
slot_flags = SLOT_TIE
|
||||
var/obj/item/dosimeter_film/current_film = null
|
||||
|
||||
/obj/item/clothing/accessory/dosimeter/New()
|
||||
..()
|
||||
/obj/item/clothing/accessory/dosimeter/Initialize(mapload)
|
||||
. = ..()
|
||||
current_film = new /obj/item/dosimeter_film(src)
|
||||
update_state(current_film.state)
|
||||
START_PROCESSING(SSobj, src)
|
||||
@@ -119,8 +119,8 @@
|
||||
max_storage_space = (ITEMSIZE_COST_SMALL * 4) + (ITEMSIZE_COST_TINY * 1)
|
||||
w_class = ITEMSIZE_SMALL
|
||||
|
||||
/obj/item/storage/box/dosimeter/New()
|
||||
..()
|
||||
/obj/item/storage/box/dosimeter/Initialize(mapload)
|
||||
. = ..()
|
||||
new /obj/item/paper/dosimeter_manual(src)
|
||||
new /obj/item/clothing/accessory/dosimeter(src)
|
||||
new /obj/item/dosimeter_film(src)
|
||||
|
||||
@@ -58,7 +58,8 @@
|
||||
var/datum/gas_mixture/env = T.return_air()
|
||||
. += span_notice("Pressure: [env.return_pressure()]kPa / Temperature: [env.temperature]K ")
|
||||
|
||||
/obj/item/clothing/accessory/watch/survival/New()
|
||||
/obj/item/clothing/accessory/watch/survival/Initialize(mapload)
|
||||
. = ..()
|
||||
gps = new/obj/item/gps/watch(src)
|
||||
|
||||
/obj/item/gps/watch
|
||||
|
||||
@@ -304,8 +304,8 @@
|
||||
origin_tech = list(TECH_ILLEGAL = 3)
|
||||
var/list/global/clothing_choices
|
||||
|
||||
/obj/item/clothing/glasses/chameleon/New()
|
||||
..()
|
||||
/obj/item/clothing/glasses/chameleon/Initialize(mapload)
|
||||
. = ..()
|
||||
if(!clothing_choices)
|
||||
clothing_choices = generate_chameleon_choices(/obj/item/clothing/glasses, list(src.type))
|
||||
|
||||
|
||||
@@ -97,8 +97,8 @@ BLIND // can't see anything
|
||||
vision_flags = SEE_TURFS
|
||||
enables_planes = list(VIS_FULLBRIGHT, VIS_MESONS)
|
||||
|
||||
/obj/item/clothing/glasses/meson/New()
|
||||
..()
|
||||
/obj/item/clothing/glasses/meson/Initialize(mapload)
|
||||
. = ..()
|
||||
overlay = global_hud.meson
|
||||
|
||||
/obj/item/clothing/glasses/meson/prescription
|
||||
@@ -142,8 +142,8 @@ BLIND // can't see anything
|
||||
actions_types = list(/datum/action/item_action/toggle_goggles)
|
||||
item_flags = AIRTIGHT
|
||||
|
||||
/obj/item/clothing/glasses/science/New()
|
||||
..()
|
||||
/obj/item/clothing/glasses/science/Initialize(mapload)
|
||||
. = ..()
|
||||
overlay = global_hud.science
|
||||
|
||||
/obj/item/clothing/glasses/goggles
|
||||
@@ -172,8 +172,8 @@ BLIND // can't see anything
|
||||
species_restricted = list("Vox")
|
||||
flags = PHORONGUARD
|
||||
|
||||
/obj/item/clothing/glasses/night/New()
|
||||
..()
|
||||
/obj/item/clothing/glasses/night/Initialize(mapload)
|
||||
. = ..()
|
||||
overlay = global_hud.nvg
|
||||
|
||||
/obj/item/clothing/glasses/eyepatch
|
||||
@@ -264,8 +264,8 @@ BLIND // can't see anything
|
||||
flash_protection = FLASH_PROTECTION_REDUCED
|
||||
enables_planes = list(VIS_FULLBRIGHT, VIS_MESONS)
|
||||
|
||||
/obj/item/clothing/glasses/graviton/New()
|
||||
..()
|
||||
/obj/item/clothing/glasses/graviton/Initialize(mapload)
|
||||
. = ..()
|
||||
overlay = global_hud.material
|
||||
|
||||
/obj/item/clothing/glasses/regular
|
||||
@@ -551,8 +551,8 @@ BLIND // can't see anything
|
||||
M.disabilities &= ~NEARSIGHTED
|
||||
..()
|
||||
|
||||
/obj/item/clothing/glasses/thermal/New()
|
||||
..()
|
||||
/obj/item/clothing/glasses/thermal/Initialize(mapload)
|
||||
. = ..()
|
||||
overlay = global_hud.thermal
|
||||
|
||||
/obj/item/clothing/glasses/thermal/syndi //These are now a traitor item, concealed as mesons. -Pete
|
||||
|
||||
@@ -16,8 +16,8 @@
|
||||
var/ar_toggled = TRUE //Used for toggle_ar_planes() verb
|
||||
|
||||
|
||||
/obj/item/clothing/glasses/omnihud/New()
|
||||
..()
|
||||
/obj/item/clothing/glasses/omnihud/Initialize(mapload)
|
||||
. = ..()
|
||||
if(tgarscreen_path)
|
||||
tgarscreen = new tgarscreen_path(src)
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
// Our clear gas masks don't hide faces, but changing the var on mask/gas would require un-chaging it on all children. This is nicer.
|
||||
/obj/item/clothing/mask/gas/New()
|
||||
/obj/item/clothing/mask/gas/Initialize(mapload)
|
||||
. = ..()
|
||||
if(type == /obj/item/clothing/mask/gas)
|
||||
flags_inv &= ~HIDEFACE
|
||||
..()
|
||||
|
||||
// Since we changed the gas mask sprite, if we want the old one for some reason use this.
|
||||
/obj/item/clothing/mask/gas/wwii
|
||||
|
||||
@@ -15,8 +15,8 @@
|
||||
item_state_slots = list(slot_r_hand_str = null, slot_l_hand_str = null)
|
||||
w_class = ITEMSIZE_TINY
|
||||
|
||||
/obj/item/clothing/mask/muzzle/New()
|
||||
..()
|
||||
/obj/item/clothing/mask/muzzle/Initialize(mapload)
|
||||
. = ..()
|
||||
say_messages = list("Mmfph!", "Mmmf mrrfff!", "Mmmf mnnf!")
|
||||
say_verbs = list("mumbles", "says")
|
||||
|
||||
@@ -217,8 +217,8 @@
|
||||
w_class = ITEMSIZE_SMALL
|
||||
body_parts_covered = HEAD|FACE
|
||||
*/
|
||||
/obj/item/clothing/mask/horsehead/New()
|
||||
..()
|
||||
/obj/item/clothing/mask/horsehead/Initialize(mapload)
|
||||
. = ..()
|
||||
// The horse mask doesn't cause voice changes by default, the wizard spell changes the flag as necessary
|
||||
say_messages = list("NEEIIGGGHHHH!", "NEEEIIIIGHH!", "NEIIIGGHH!", "HAAWWWWW!", "HAAAWWW!")
|
||||
say_verbs = list("whinnies", "neighs", "says")
|
||||
@@ -232,7 +232,8 @@
|
||||
body_parts_covered = 0
|
||||
var/mob/observer/eye/aiEye/eye
|
||||
|
||||
/obj/item/clothing/mask/ai/New()
|
||||
/obj/item/clothing/mask/ai/Initialize(mapload)
|
||||
. = ..()
|
||||
eye = new(src)
|
||||
|
||||
/obj/item/clothing/mask/ai/equipped(var/mob/user, var/slot)
|
||||
|
||||
@@ -33,6 +33,6 @@
|
||||
changer.voice = null
|
||||
to_chat(usr, span_notice("You have reset your voice changer's mimicry feature."))
|
||||
|
||||
/obj/item/clothing/mask/gas/voice/New()
|
||||
..()
|
||||
/obj/item/clothing/mask/gas/voice/Initialize(mapload)
|
||||
. = ..()
|
||||
changer = new(src)
|
||||
|
||||
@@ -119,8 +119,8 @@
|
||||
var/gun_type = /obj/item/gun/energy/lasercannon/mounted
|
||||
var/obj/item/gun/gun
|
||||
|
||||
/obj/item/rig_module/mounted/New()
|
||||
..()
|
||||
/obj/item/rig_module/mounted/Initialize(mapload)
|
||||
. = ..()
|
||||
gun = new gun_type(src)
|
||||
|
||||
/obj/item/rig_module/mounted/engage(atom/target)
|
||||
|
||||
@@ -237,11 +237,7 @@
|
||||
|
||||
interface_name = "contact datajack"
|
||||
interface_desc = "An induction-powered high-throughput datalink suitable for hacking encrypted networks."
|
||||
var/list/stored_research
|
||||
|
||||
/obj/item/rig_module/datajack/New()
|
||||
..()
|
||||
stored_research = list()
|
||||
var/list/stored_research = list()
|
||||
|
||||
/obj/item/rig_module/datajack/engage(atom/target)
|
||||
|
||||
|
||||
@@ -182,8 +182,8 @@
|
||||
interface_name = "dead man's switch"
|
||||
interface_desc = "An integrated self-destruct module. When the wearer dies, they vanish in smoke. Do not press this button."
|
||||
|
||||
/obj/item/rig_module/self_destruct/New()
|
||||
..()
|
||||
/obj/item/rig_module/self_destruct/Initialize(mapload)
|
||||
. = ..()
|
||||
src.smoke = new /datum/effect/effect/system/smoke_spread/bad()
|
||||
src.smoke.attach(src)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user