mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-22 03:27:05 +01:00
refactor human butchering trait (#28725)
* refactor human butchering trait * Update code/datums/elements/butchers_humans.dm Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> Signed-off-by: warriorstar-orion <orion@snowfrost.garden> --------- Signed-off-by: warriorstar-orion <orion@snowfrost.garden> Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
This commit is contained in:
co-authored by
Contrabang
parent
c6c4e82ff4
commit
23bb467991
@@ -299,9 +299,6 @@ GLOBAL_DATUM_INIT(welding_sparks, /mutable_appearance, mutable_appearance('icons
|
||||
. += "<span class='notice'>Has [length(attached_bits)] bits attached.</span>"
|
||||
. += "<span class='notice'>Bits can be removed with Alt-Click.</span>"
|
||||
|
||||
if(HAS_TRAIT(src, TRAIT_BUTCHERS_HUMANS))
|
||||
. += "<span class='warning'>Can be used to butcher dead people into meat while on harm intent.</span>"
|
||||
|
||||
/obj/item/burn()
|
||||
if(!QDELETED(src))
|
||||
var/turf/T = get_turf(src)
|
||||
|
||||
@@ -183,7 +183,7 @@
|
||||
|
||||
/obj/item/kitchen/knife/butcher/meatcleaver/Initialize(mapload)
|
||||
. = ..()
|
||||
ADD_TRAIT(src, TRAIT_BUTCHERS_HUMANS, ROUNDSTART_TRAIT)
|
||||
AddElement(/datum/element/butchers_humans)
|
||||
|
||||
/obj/item/kitchen/knife/combat
|
||||
name = "combat knife"
|
||||
|
||||
@@ -521,7 +521,7 @@
|
||||
|
||||
/obj/item/butcher_chainsaw/Initialize(mapload)
|
||||
. = ..()
|
||||
ADD_TRAIT(src, TRAIT_BUTCHERS_HUMANS, ROUNDSTART_TRAIT)
|
||||
AddElement(/datum/element/butchers_humans)
|
||||
AddComponent(/datum/component/two_handed, \
|
||||
force_wielded = 40, \
|
||||
force_unwielded = force, \
|
||||
|
||||
Reference in New Issue
Block a user