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:
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
+2 -2
View File
@@ -187,8 +187,8 @@
if (last_to_emag)
C.friends = list(last_to_emag)
/obj/machinery/computer/HolodeckControl/New()
..()
/obj/machinery/computer/HolodeckControl/Initialize(mapload)
. = ..()
current_program = powerdown_program
linkedholodeck = locate(projection_area)
if(!linkedholodeck)
+6 -10
View File
@@ -301,11 +301,11 @@
unacidable = TRUE
var/active = 0
/obj/item/holo/esword/green/New()
lcolor = "#008000"
/obj/item/holo/esword/green
lcolor = "#008000"
/obj/item/holo/esword/red/New()
lcolor = "#FF0000"
/obj/item/holo/esword/red
lcolor = "#FF0000"
/obj/item/holo/esword/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack")
if(active && default_parry_check(user, attacker, damage_source) && prob(50))
@@ -431,10 +431,6 @@
to_chat(user, "The station AI is not to interact with these devices!")
return
/obj/machinery/readybutton/New()
..()
/obj/machinery/readybutton/attackby(obj/item/W, mob/user)
to_chat(user, "The device is a solid button, there's nothing you can do with it!")
@@ -501,8 +497,8 @@
meat_amount = 0
meat_type = null
/mob/living/simple_mob/animal/space/carp/holodeck/New()
..()
/mob/living/simple_mob/animal/space/carp/holodeck/Initialize(mapload)
. = ..()
set_light(2) //hologram lighting
/mob/living/simple_mob/animal/space/carp/holodeck/proc/set_safety(var/safe)