cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-26 13:39:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

new->init refactor

Browse Source
This commit is contained in:
Killian
2022-02-20 19:32:23 +00:00
parent 3f9af78f3a
commit 91d39da943
71 changed files with 182 additions and 4839 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/flashlight.dm
+1 -7
View File
@@ -504,15 +504,9 @@
on = 1 //Bio-luminesence has one setting, on.
power_use = 0
<<<<<<< HEAD
/obj/item/device/flashlight/slime/New()
..()
set_light(light_range, light_power, light_color)
=======
/obj/item/device/flashlight/slime/Initialize()
. = ..()
set_light(brightness_on, flashlight_power, flashlight_colour)
>>>>>>> 2f0a618d451... /atom New() => Initialize() [MDB IGNORE] (#8298)
set_light(light_range, light_power, light_color)
/obj/item/device/flashlight/slime/update_brightness()
return
code/game/objects/items/devices/paicard.dm
+1 -7
View File
@@ -22,15 +22,9 @@ GLOBAL_LIST_BOILERPLATE(all_pai_cards, /obj/item/device/paicard)
if(istype(rig))
rig.forced_move(direction, user)
<<<<<<< HEAD
/obj/item/device/paicard/New()
..()
add_overlay("pai-off")
=======
/obj/item/device/paicard/Initialize()
. = ..()
overlays += "pai-off"
>>>>>>> 2f0a618d451... /atom New() => Initialize() [MDB IGNORE] (#8298)
add_overlay("pai-off")
/obj/item/device/paicard/Destroy()
//Will stop people throwing friend pAIs into the singularity so they can respawn
code/game/objects/items/devices/radio/radio.dm
-22
View File
@@ -1,7 +1,6 @@
// Access check is of the type requires one. These have been carefully selected to avoid allowing the janitor to see channels he shouldn't
//VOREStation Edit Start - Updating this for Virgo
var/global/list/default_internal_channels = list(
<<<<<<< HEAD
num2text(PUB_FREQ) = list(),
num2text(AI_FREQ) = list(access_synth),
num2text(ENT_FREQ) = list(),
@@ -22,27 +21,6 @@ var/global/list/default_medbay_channels = list(
num2text(PUB_FREQ) = list(),
num2text(MED_FREQ) = list(),
num2text(MED_I_FREQ) = list()
=======
num2text(PUB_FREQ) = list(),
num2text(AI_FREQ) = list(access_synth),
num2text(ENT_FREQ) = list(),
num2text(ERT_FREQ) = list(access_cent_specops),
num2text(COMM_FREQ) = list(access_heads),
num2text(ENG_FREQ) = list(access_engine_equip, access_atmospherics),
num2text(MED_FREQ) = list(access_medical_equip),
num2text(MED_I_FREQ) = list(access_medical_equip),
num2text(SEC_FREQ) = list(access_security),
num2text(SEC_I_FREQ) = list(access_security),
num2text(SCI_FREQ) = list(access_tox,access_robotics,access_xenobiology),
num2text(SUP_FREQ) = list(access_cargo),
num2text(SRV_FREQ) = list(access_janitor, access_hydroponics)
)
var/global/list/default_medbay_channels = list(
num2text(PUB_FREQ) = list(),
num2text(MED_FREQ) = list(access_medical_equip),
num2text(MED_I_FREQ) = list(access_medical_equip)
>>>>>>> 2f0a618d451... /atom New() => Initialize() [MDB IGNORE] (#8298)
)
//VOREStation Edit End
code/game/objects/items/weapons/tools/wirecutters.dm
+1 -9
View File
@@ -26,8 +26,7 @@
tool_qualities = list(TOOL_WIRECUTTER)
var/random_color = TRUE
<<<<<<< HEAD
/obj/item/weapon/tool/wirecutters/New()
/obj/item/weapon/tool/wirecutters/Initialize()
if(random_color)
switch(pick("red","blue","yellow"))
if ("red")
@@ -42,14 +41,7 @@
if (prob(75))
src.pixel_y = rand(0, 16)
..()
=======
/obj/item/weapon/tool/wirecutters/Initialize()
if(random_color && prob(50))
icon_state = "cutters-y"
item_state = "cutters_yellow"
. = ..()
>>>>>>> 2f0a618d451... /atom New() => Initialize() [MDB IGNORE] (#8298)
/obj/item/weapon/tool/wirecutters/attack(mob/living/carbon/C as mob, mob/user as mob)
if(istype(C) && user.a_intent == I_HELP && (C.handcuffed) && (istype(C.handcuffed, /obj/item/weapon/handcuffs/cable)))