Label GS13 changes

Since commit 5084020 on Jan 30, 2023
This commit is contained in:
psq95
2023-08-29 21:50:24 +01:00
parent 8e09f3b9ca
commit cb43bf0dfc
77 changed files with 253 additions and 247 deletions
+2 -5
View File
@@ -15,10 +15,7 @@
/obj/item/reagent_containers/food,
/obj/item/reagent_containers/glass,
/obj/item/reagent_containers/chem_pack))
//GS13 EDIT
///What kind of attachment point is used?
var/attachment_point = "needle"
//GS13 EDIT END
var/attachment_point = "needle" // GS13
/obj/machinery/iv_drip/Initialize(mapload)
. = ..()
@@ -124,7 +121,7 @@
return PROCESS_KILL
if(!(get_dist(src, attached) <= 1 && isturf(attached.loc)))
to_chat(attached, "<span class='userdanger'>[src] [attachment_point] is ripped out of you!</span>")
to_chat(attached, "<span class='userdanger'>[src] [attachment_point] is ripped out of you!</span>") // GS13
attached.apply_damage(3, BRUTE, pick(BODY_ZONE_R_ARM, BODY_ZONE_L_ARM))
attached = null
update_icon()
+5 -1
View File
@@ -18,7 +18,11 @@
var/item_recycle_sound = 'sound/items/welder.ogg'
/obj/machinery/recycler/Initialize()
AddComponent(/datum/component/material_container, list(MAT_METAL, MAT_GLASS, MAT_PLASMA, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_URANIUM, MAT_BANANIUM, MAT_CALORITE, MAT_TITANIUM, MAT_BLUESPACE, MAT_PLASTIC), INFINITY, FALSE, null, null, null, TRUE)
// GS13 calorite
AddComponent(/datum/component/material_container, list(
MAT_METAL, MAT_GLASS, MAT_PLASMA, MAT_SILVER, MAT_GOLD, MAT_DIAMOND,
MAT_URANIUM, MAT_BANANIUM, MAT_CALORITE, MAT_TITANIUM, MAT_BLUESPACE, MAT_PLASTIC),
INFINITY, FALSE, null, null, null, TRUE)
AddComponent(/datum/component/butchering, 1, amount_produced,amount_produced/5)
. = ..()
update_icon()