mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-01-16 03:56:20 +00:00
ead0e859db
This PR fixes a case where certain materials caused issues when working with stacking machines, because they did not have set merge_type from the get go, which meant that initial() of that variable returned null. To clarify further - if /obj/item/stack does not have set merge_type, it is generated merge_type upon Initialize(), which is the same as its typepath. For example, currently /obj/item/stack/sheet/bluespace_crystal does not have any merge_type set, and it is given merge_type = /obj/item/stack/sheet/bluespace_crystal upon Initialize(). Each Initialize(). Again and again. There are quite a bit of these cases in the codebase, especially if its some older code. I have gone through them and set all of them their set merge_type, which they would inevitably receive anyway upon initializing and it fixes a bug mentioned above. To prevent this happening again, I have also included unit test to check if merge types are set for stacks, included exceptions are usually abstract paths like /obj/item/stack/sheet/mineral, which contains zero behavior on its own and does not spawn unless done via admin tools.
58 lines
2.4 KiB
Plaintext
58 lines
2.4 KiB
Plaintext
/obj/item/stack/circuit_stack
|
|
name = "polycircuit aggregate"
|
|
desc = "A dense, overdesigned cluster of electronics which attempted to function as a multipurpose circuit electronic. Circuits can be removed from it... if you don't bleed out in the process."
|
|
icon_state = "circuit_mess"
|
|
inhand_icon_state = "rods"
|
|
w_class = WEIGHT_CLASS_TINY
|
|
max_amount = 8
|
|
merge_type = /obj/item/stack/circuit_stack
|
|
var/circuit_type = /obj/item/electronics/airlock
|
|
var/chosen_circuit = "airlock"
|
|
|
|
/obj/item/stack/circuit_stack/attack_self(mob/user)// Prevents the crafting menu, and tells you how to use it.
|
|
to_chat(user, "<span class='warning'>You can't use [src] by itself, you'll have to try and remove one of these circuits by hand... carefully.</span>")
|
|
|
|
/obj/item/stack/circuit_stack/attack_hand(mob/user)
|
|
var/mob/living/carbon/human/H = user
|
|
if(user.get_inactive_held_item() != src)
|
|
return ..()
|
|
else
|
|
if(zero_amount())
|
|
return
|
|
chosen_circuit = input("What type of circuit would you like to remove?", "Choose a Circuit Type", chosen_circuit) in list("airlock","firelock","fire alarm","air alarm","APC","cancel")
|
|
if(zero_amount())
|
|
return
|
|
if(loc != user)
|
|
return
|
|
switch(chosen_circuit)
|
|
if("cancel")
|
|
to_chat(user, "<span class='notice'>You wisely avoid putting your hands anywhere near [src].</span>")
|
|
return
|
|
if("airlock")
|
|
circuit_type = /obj/item/electronics/airlock
|
|
if("firelock")
|
|
circuit_type = /obj/item/electronics/firelock
|
|
if("fire alarm")
|
|
circuit_type = /obj/item/electronics/firealarm
|
|
if("air alarm")
|
|
circuit_type = /obj/item/electronics/airalarm
|
|
if("APC")
|
|
circuit_type = /obj/item/electronics/apc
|
|
to_chat(user, "<span class='notice'>You spot your circuit, and carefully attempt to remove it from [src], hold still!</span>")
|
|
if(do_after(user, 30, target = user))
|
|
if(!src || QDELETED(src))//Sanity Check.
|
|
return
|
|
var/returned_circuit = new circuit_type(src)
|
|
user.put_in_hands(returned_circuit)
|
|
use(1)
|
|
if(!amount)
|
|
to_chat(user, "<span class='notice'>You navigate the sharp edges of circuitry and remove the last board.</span>")
|
|
else
|
|
to_chat(user, "<span class='notice'>You navigate the sharp edges of circuitry and remove a single board from [src]</span>")
|
|
else
|
|
H.apply_damage(15, BRUTE, pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM))
|
|
to_chat(user, "<span class='warning'>You give yourself a wicked cut on [src]'s many sharp corners and edges!</span>")
|
|
|
|
/obj/item/stack/circuit_stack/full
|
|
amount = 8
|