"
-
- for(var/i in cat_recipes)
- var/datum/pipe_info/I = i
- dat += I.Render(src)
-
- dat += "
"
-
- user << browse("[src][dat]", "window=pipedispenser")
- return
-
-
-/obj/machinery/pipedispenser/disposal/Topic(href, href_list)
- if(..())
- return 1
- usr.set_machine(src)
- add_fingerprint(usr)
- if(href_list["dmake"])
- if(wait < world.time)
- var/p_type = text2path(href_list["dmake"])
- if (!verify_recipe(GLOB.disposal_pipe_recipes, p_type))
- return
- var/obj/structure/disposalconstruct/C = new (loc, p_type)
-
- if(!C.can_place())
- to_chat(usr, "There's not enough room to build that here!")
- qdel(C)
- return
- if(href_list["dir"])
- C.setDir(text2num(href_list["dir"]))
- C.add_fingerprint(usr)
- C.update_appearance()
- wait = world.time + 15
- return
-
-//transit tube dispenser
-//inherit disposal for the dragging proc
-/obj/machinery/pipedispenser/disposal/transit_tube
- name = "transit tube dispenser"
- icon = 'icons/obj/stationobjs.dmi'
- icon_state = "pipe_d"
- density = TRUE
- desc = "Dispenses pipes that will move beings around."
-
-/obj/machinery/pipedispenser/disposal/transit_tube/interact(mob/user)
-
- var/dat = {"Transit Tubes:
-Straight Tube
-Straight Tube with Crossing
-Curved Tube
-Diagonal Tube
-Diagonal Tube with Crossing
-Junction
-Station Equipment:
-Through Tube Station
-Terminus Tube Station
-Transit Tube Pod
-"}
-
- user << browse("[src][dat]", "window=pipedispenser")
- return
-
-
-/obj/machinery/pipedispenser/disposal/transit_tube/Topic(href, href_list)
- if(..())
- return 1
- usr.set_machine(src)
- add_fingerprint(usr)
- if(wait < world.time)
- if(href_list["tube"])
- var/tube_type = text2num(href_list["tube"])
- var/obj/structure/C
- switch(tube_type)
- if(TRANSIT_TUBE_STRAIGHT)
- C = new /obj/structure/c_transit_tube(loc)
- if(TRANSIT_TUBE_STRAIGHT_CROSSING)
- C = new /obj/structure/c_transit_tube/crossing(loc)
- if(TRANSIT_TUBE_CURVED)
- C = new /obj/structure/c_transit_tube/curved(loc)
- if(TRANSIT_TUBE_DIAGONAL)
- C = new /obj/structure/c_transit_tube/diagonal(loc)
- if(TRANSIT_TUBE_DIAGONAL_CROSSING)
- C = new /obj/structure/c_transit_tube/diagonal/crossing(loc)
- if(TRANSIT_TUBE_JUNCTION)
- C = new /obj/structure/c_transit_tube/junction(loc)
- if(TRANSIT_TUBE_STATION)
- C = new /obj/structure/c_transit_tube/station(loc)
- if(TRANSIT_TUBE_TERMINUS)
- C = new /obj/structure/c_transit_tube/station/reverse(loc)
- if(TRANSIT_TUBE_POD)
- C = new /obj/structure/c_transit_tube_pod(loc)
- if(C)
- C.add_fingerprint(usr)
- wait = world.time + 15
- return
+/obj/machinery/pipedispenser/proc/make_pipe(mob/user)
+ if(busy)
+ src.visible_message(span_warning("[src] is busy."))
+ return
+ var/queued_p_type = recipe.id
+ var/queued_p_dir = p_dir
+ var/queued_p_flipped = p_flipped
+ switch(category)
+ if(ATMOS_CATEGORY)
+ if(recipe.type == /datum/pipe_info/meter)
+ new /obj/item/pipe_meter(loc)
+ on_make_pipe()
+ else
+ if(recipe.all_layers == FALSE && (piping_layer == 1 || piping_layer == 5))
+ src.visible_message(span_warning("[src] can't print this object on the layer..."))
+ return
+ var/obj/machinery/atmospherics/path = queued_p_type
+ var/pipe_item_type = initial(path.construction_type) || /obj/item/pipe
+ var/obj/item/pipe/P = new pipe_item_type(loc, queued_p_type, queued_p_dir)
+ on_make_pipe()
+
+ if(queued_p_flipped && istype(P, /obj/item/pipe/trinary/flippable))
+ var/obj/item/pipe/trinary/flippable/F = P
+ F.flipped = queued_p_flipped
+
+ P.update()
+ P.setPipingLayer(piping_layer)
+ if(ispath(path, /obj/machinery/atmospherics/pipe) && !findtext("[queued_p_type]", "layer_manifold"))
+ P.add_atom_colour(GLOB.pipe_paint_colors[paint_color], FIXED_COLOUR_PRIORITY)
+
+ if(DISPOSALS_CATEGORY) //Making disposals pipes
+ new /obj/structure/disposalconstruct(loc, queued_p_type, queued_p_dir, queued_p_flipped)
+ on_make_pipe()
+ return
+
+ if(TRANSIT_CATEGORY) //Making transit tubes
+ if(istype(queued_p_type, /obj/structure/c_transit_tube_pod))
+ new /obj/structure/c_transit_tube_pod(loc)
+ on_make_pipe()
+ else
+ var/obj/structure/c_transit_tube/tube = new queued_p_type(loc)
+ on_make_pipe()
+ tube.setDir(queued_p_dir)
+
+ if(queued_p_flipped)
+ tube.setDir(turn(queued_p_dir, 45))
+ tube.simple_rotate_flip()
+
+/obj/machinery/pipedispenser/proc/on_make_pipe()
+ busy = TRUE
+ delay = addtimer(CALLBACK(src, PROC_REF(reset_busy)), 5)
+
+/obj/machinery/pipedispenser/proc/reset_busy()
+ busy = FALSE
+
+#undef ATMOS_CATEGORY
+#undef DISPOSALS_CATEGORY
+#undef TRANSIT_CATEGORY
diff --git a/code/game/machinery/porta_turret/portable_turret.dm b/code/game/machinery/porta_turret/portable_turret.dm
index 3e50954df0c7..5c592c7409dd 100644
--- a/code/game/machinery/porta_turret/portable_turret.dm
+++ b/code/game/machinery/porta_turret/portable_turret.dm
@@ -77,8 +77,6 @@ DEFINE_BITFIELD(turret_flags, list(
var/has_cover = TRUE
/// The cover that is covering this turret
var/obj/machinery/porta_turret_cover/cover = null
- /// World.time the turret last fired
- var/last_fired = 0
/// Ticks until next shot (1.5 ?)
var/shot_delay = 15
/// Turret flags about who is turret allowed to shoot
@@ -101,6 +99,8 @@ DEFINE_BITFIELD(turret_flags, list(
var/datum/action/turret_toggle/toggle_action
/// Mob that is remotely controlling the turret
var/mob/remote_controller
+ //our cooldowns
+ COOLDOWN_DECLARE(fire_cooldown)
/// For connecting to additional turrets
var/id = ""
@@ -599,9 +599,9 @@ DEFINE_BITFIELD(turret_flags, list(
return
if(!(obj_flags & EMAGGED)) //if it hasn't been emagged, cooldown before shooting again
- if(last_fired + shot_delay > world.time)
+ if(!COOLDOWN_FINISHED(src, fire_cooldown))
return
- last_fired = world.time
+ COOLDOWN_START(src, fire_cooldown, shot_delay)
var/turf/T = get_turf(src)
var/turf/U = get_turf(target)
@@ -842,6 +842,44 @@ DEFINE_BITFIELD(turret_flags, list(
stun_projectile_sound = 'sound/weapons/gun/smg/shot.ogg'
desc = "A ballistic machine gun auto-turret."
+//high rof, range, faster projectile speed
+/* 'Nanotrasen' turrets */
+
+/obj/machinery/porta_turret/ship/nt
+ name = "Sharplite Defense Turret"
+ desc = "A cheap and effective turret designed by Sharplite and purchased and installed on most Nanotrasen Vessels."
+ faction = list(FACTION_PLAYER_NANOTRASEN, "turret")
+ icon_state = "standard_lethal"
+ base_icon_state = "standard"
+ stun_projectile = /obj/projectile/beam/disabler/sharplite
+ lethal_projectile = /obj/projectile/beam/laser/sharplite
+ lethal_projectile_sound = 'sound/weapons/gun/laser/nt-fire.ogg'
+ stun_projectile_sound = 'sound/weapons/taser2.ogg'
+ shot_delay = 10
+ scan_range = 10
+
+/obj/machinery/porta_turret/ship/nt/light
+ name = "Sharplite LDS"
+ desc = "A cheap and effective 'defensive system' designed by Sharplite for installation on Nanotrasen vessels."
+ stun_projectile = /obj/projectile/beam/disabler/weak/sharplite
+ lethal_projectile = /obj/projectile/beam/laser/light/sharplite
+ lethal_projectile_sound = 'sound/weapons/gun/laser/nt-fire.ogg'
+ stun_projectile_sound = 'sound/weapons/taser2.ogg'
+
+
+/obj/machinery/porta_turret/ship/nt/heavy
+ name = "Sharplite Defense Cannon"
+ desc = "A heavy laser mounting designed by Sharplite for usage on Nanotrasen vessels."
+ lethal_projectile = /obj/projectile/beam/laser/heavylaser/sharplite
+ lethal_projectile_sound = 'sound/weapons/lasercannonfire.ogg'
+
+/obj/machinery/porta_turret/ship/nt/pulse
+ name = "Sharplite Pulse Cannon"
+ desc = "A pulse cannon mounting designed by Sharplite. Not sold to any purchasers and exclusively used on Nanotrasen Vessels."
+ lethal_projectile = /obj/projectile/beam/pulse/sharplite_turret
+ lethal_projectile_sound = 'sound/weapons/gun/laser/heavy_laser.ogg'
+
+
/* Syndicate Turrets */
@@ -866,6 +904,40 @@ DEFINE_BITFIELD(turret_flags, list(
lethal_projectile = /obj/projectile/beam/laser/heavylaser
lethal_projectile_sound = 'sound/weapons/lasercannonfire.ogg'
+/* Inteq Turrets */
+
+/obj/machinery/porta_turret/ship/inteq
+ name = "Vanguard Turret"
+ desc = "A turret designed by IRMG engineers for defending ships from hostile flora, fauna, and people (and Elzousa, which count as flora and people)."
+ stun_projectile = /obj/projectile/bullet/a762_40/rubber
+ stun_projectile_sound = 'sound/weapons/gun/rifle/skm.ogg'
+ lethal_projectile = /obj/projectile/bullet/a762_40
+ lethal_projectile_sound = 'sound/weapons/gun/rifle/skm.ogg'
+ scan_range = 8
+ shot_delay = 20
+ faction = list(FACTION_PLAYER_INTEQ, "turret")
+
+/obj/machinery/porta_turret/ship/inteq/light
+ name = "Close-In Vanguard Turret"
+ desc = "A light turret designed by IRMG engineers for the the task of defending from close-in encounters. Low power, high speed."
+ stun_projectile = /obj/projectile/bullet/c10mm/rubber
+ stun_projectile_sound = 'sound/weapons/gun/smg/vector_fire.ogg'
+ lethal_projectile = /obj/projectile/bullet/c10mm
+ lethal_projectile_sound = 'sound/weapons/gun/smg/vector_fire.ogg'
+ subsystem_type = /datum/controller/subsystem/processing/fastprocess //turns out if you have a shot delay below what SSmachines fires at you need to use a different subsystem
+ scan_range = 4
+ shot_delay = 5
+
+/obj/machinery/porta_turret/ship/inteq/heavy
+ name = "Vanguard Overwatch Turret"
+ desc = "A turret designed by IRMG engineers to provide long range defensive fire on their installations. Has a habit of leaving big holes."
+ stun_projectile = /obj/projectile/bullet/a308/rubber
+ stun_projectile_sound = 'sound/weapons/gun/rifle/f4.ogg'
+ lethal_projectile = /obj/projectile/bullet/a308
+ lethal_projectile_sound = 'sound/weapons/gun/rifle/f4.ogg'
+ scan_range = 12
+ shot_delay = 20
+
/* Solcon Turrets */
/obj/machinery/porta_turret/ship/solgov
diff --git a/code/game/machinery/washing_machine.dm b/code/game/machinery/washing_machine.dm
index 1d6a9e3845b8..4f32fe1d2d3d 100644
--- a/code/game/machinery/washing_machine.dm
+++ b/code/game/machinery/washing_machine.dm
@@ -233,10 +233,6 @@ GLOBAL_LIST_INIT(dye_registry, list(
new /obj/item/stack/sheet/wethide(drop_location(), amount)
qdel(src)
-/obj/item/clothing/suit/hooded/ian_costume/machine_wash(obj/machinery/washing_machine/WM)
- new /obj/item/reagent_containers/food/snacks/meat/slab/corgi(loc)
- qdel(src)
-
/mob/living/simple_animal/pet/machine_wash(obj/machinery/washing_machine/WM)
WM.bloody_mess = TRUE
gib()
diff --git a/code/game/mecha/combat/durand.dm b/code/game/mecha/combat/durand.dm
index 4ccf400e6ab1..a42e1e29f7ee 100644
--- a/code/game/mecha/combat/durand.dm
+++ b/code/game/mecha/combat/durand.dm
@@ -12,23 +12,24 @@
force = 40
wreckage = /obj/structure/mecha_wreckage/durand
var/obj/durand_shield/shield
+ var/shield_type = /obj/durand_shield
var/shield_passive_drain = 300
+
/obj/mecha/combat/durand/clip
- desc = "An aging combat exosuit appropriated from abandoned Nanotrasen facilities, now supplied to the CMM-BARD anti-xenofauna division."
+ desc = "An aging combat exosuit appropriated from abandoned Nanotrasen facilities, now supplied to the CMM-BARD anti-xenofauna division. The defence grid has been modified to disperse controlled electric shocks on contact, at the cost of its ability to block ranged projectiles."
name = "\improper Paladin"
icon_state = "clipdurand"
wreckage = /obj/structure/mecha_wreckage/durand/clip
armor = list("melee" = 40, "bullet" = 35, "laser" = 15, "energy" = 10, "bomb" = 20, "bio" = 0, "rad" = 50, "fire" = 100, "acid" = 100)
-
- //TODO: Custom melee backlash shield with no projectile protection
+ shield_passive_drain = 0
+ shield_type = /obj/durand_shield/clip
/obj/mecha/combat/durand/Initialize()
. = ..()
- shield = new /obj/durand_shield(loc, src, layer, dir)
+ shield = new shield_type(loc, src, layer, dir)
RegisterSignal(src, COMSIG_MECHA_ACTION_ACTIVATE, PROC_REF(relay))
- RegisterSignal(src, COMSIG_PROJECTILE_PREHIT, PROC_REF(prehit))
/obj/mecha/combat/durand/Destroy()
@@ -71,22 +72,21 @@
if(!shield) //if the shield somehow got deleted
stack_trace("Durand triggered relay without a shield")
- shield = new /obj/durand_shield(loc, src, layer)
+ shield = new shield_type(loc, src, layer)
shield.setDir(dir)
SEND_SIGNAL(shield, COMSIG_MECHA_ACTION_ACTIVATE, source, signal_args)
//Redirects projectiles to the shield if defense_check decides they should be blocked and returns true.
-/obj/mecha/combat/durand/proc/prehit(obj/projectile/source, list/signal_args)
- SIGNAL_HANDLER
-
- if(defense_check(source.loc) && shield)
- signal_args[2] = shield
-
+/obj/mecha/combat/durand/bullet_act(obj/projectile/source)
+ if(defense_check(source.loc, shield.ranged_pass))
+ shield.bullet_act(source)
+ else
+ . = ..()
/**Checks if defense mode is enabled, and if the attacker is standing in an area covered by the shield.
-Expects a turf. Returns true if the attack should be blocked, false if not.*/
-/obj/mecha/combat/durand/proc/defense_check(turf/aloc)
- if (!defense_mode || !shield || shield.switching)
+Expects a turf. Returns true if the attack should be blocked, false if not. Skip defence will make the proc return false and the attack will go through*/
+/obj/mecha/combat/durand/proc/defense_check(turf/aloc, skip_defence = FALSE)
+ if (!defense_mode || !shield || shield.switching || skip_defence)
return FALSE
. = FALSE
switch(dir)
@@ -105,26 +105,38 @@ Expects a turf. Returns true if the attack should be blocked, false if not.*/
return
/obj/mecha/combat/durand/attack_generic(mob/user, damage_amount = 0, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, armor_penetration = 0)
- if(defense_check(user.loc))
+ if(defense_check(user.loc, shield.melee_pass))
log_message("Attack absorbed by defense field. Attacker - [user].", LOG_MECHA, color="orange")
shield.attack_generic(user, damage_amount, damage_type, damage_flag, sound_effect, armor_penetration)
else
. = ..()
/obj/mecha/combat/durand/attackby(obj/item/W as obj, mob/user as mob, params)
- if(defense_check(user.loc))
+ if(defense_check(user.loc, shield.melee_pass))
log_message("Attack absorbed by defense field. Attacker - [user], with [W]", LOG_MECHA, color="orange")
shield.attackby(W, user, params)
else
. = ..()
/obj/mecha/combat/durand/hitby(atom/movable/AM, skipcatch, hitpush, blocked, datum/thrownthing/throwingdatum)
- if(defense_check(AM.loc))
+ if(defense_check(AM.loc, shield.ranged_pass))
log_message("Impact with [AM] absorbed by defense field.", LOG_MECHA, color="orange")
shield.hitby(AM, skipcatch, hitpush, blocked, throwingdatum)
else
. = ..()
+// Walking into the Paladin's shield shocks you.
+
+/obj/mecha/combat/durand/clip/Bump(atom/obstacle)
+ . = ..()
+ if(defense_check(obstacle.loc) && isliving(obstacle))
+ shield.contact(obstacle)
+
+/obj/mecha/combat/durand/clip/Bumped(atom/movable/AM)
+ . = ..()
+ if(defense_check(AM.loc) && isliving(AM))
+ shield.contact(AM)
+
////////////////////////////
///// Shield processing ////
////////////////////////////
@@ -151,7 +163,14 @@ own integrity back to max. Shield is automatically dropped if we run out of powe
light_on = FALSE
var/obj/mecha/combat/durand/chassis ///Our link back to the durand
var/switching = FALSE ///To keep track of things during the animation
+ /// if this shield lets melee attacks pass and hit the mech directly
+ var/melee_pass = FALSE
+ /// if this shield lets projectiles pass and hit the mech directly
+ var/ranged_pass = FALSE
+/obj/durand_shield/clip
+ name = "electric repulsion grid"
+ ranged_pass = TRUE
/obj/durand_shield/Initialize(mapload, _chassis, _layer, _dir)
. = ..()
@@ -230,3 +249,35 @@ the shield is disabled by means other than the action button (like running out o
/obj/durand_shield/bullet_act()
play_attack_sound()
. = ..()
+
+/// a mob has bumped into the shield
+/obj/durand_shield/proc/contact(mob/living/contactor)
+ return
+
+/// Clippy shield
+/obj/durand_shield/clip/attack_generic(mob/user, damage_amount, damage_type, damage_flag, sound_effect, armor_penetration)
+ . = ..()
+ apply_shock(user)
+
+/obj/durand_shield/clip/attackby(obj/item/I, mob/living/user, params)
+ . = ..()
+ apply_shock(user)
+
+/obj/durand_shield/clip/contact(mob/living/contactor)
+ . = ..()
+ apply_shock(contactor)
+
+/obj/durand_shield/clip/proc/apply_shock(mob/attacker)
+ var/did_shock = FALSE
+ if(iscarbon(attacker))
+ var/mob/living/carbon/victim = attacker
+ if(electrocute_mob(victim, chassis.cell, src, 1, FALSE, FALSE))
+ did_shock = TRUE
+ else if(isliving(attacker))
+ var/mob/living/victim = attacker
+ if(victim.apply_damage_type(20,BURN))
+ to_chat(victim,span_userdanger("You're shocked by \the [src]!"))
+ did_shock = TRUE
+ if(did_shock)
+ visible_message(span_bolddanger("\The [src] repels \the [attacker] on contact, shocking [attacker.p_them()]."))
+ do_sparks(5,TRUE,src)
diff --git a/code/game/mecha/combat/gygax.dm b/code/game/mecha/combat/gygax.dm
index 5fe5d9350c14..02f66b54236a 100644
--- a/code/game/mecha/combat/gygax.dm
+++ b/code/game/mecha/combat/gygax.dm
@@ -58,6 +58,13 @@
return
cell = new /obj/item/stock_parts/cell/bluespace(src)
+/obj/mecha/combat/gygax/inteq
+ name = "\improper Basenji"
+ desc = "A lightweight security exosuit, modified to IRMG standards. The leg actuators have been maxed out, allowing for powerful short ranged charges."
+ icon_state = "inteqgygax"
+ charge_break_walls = TRUE
+ charge_toss_structures = TRUE
+ charge_toss_mobs = TRUE
/obj/mecha/combat/gygax/GrantActions(mob/living/user, human_occupant = 0)
..()
@@ -67,3 +74,12 @@
/obj/mecha/combat/gygax/RemoveActions(mob/living/user, human_occupant = 0)
..()
overload_action.Remove(user)
+
+/obj/mecha/combat/gygax/inteq/GrantActions(mob/living/user, human_occupant = 0)
+ ..()
+ overload_action.Remove(user)
+ charge_action.Grant(user,src)
+
+/obj/mecha/combat/gygax/inteq/RemoveActions(mob/living/user, human_occupant)
+ . = ..()
+ charge_action.Remove(user)
diff --git a/code/game/mecha/equipment/tools/work_tools.dm b/code/game/mecha/equipment/tools/work_tools.dm
index ee8481255f2d..aa5dbf38c27f 100644
--- a/code/game/mecha/equipment/tools/work_tools.dm
+++ b/code/game/mecha/equipment/tools/work_tools.dm
@@ -491,6 +491,86 @@
return 1
//WS Edit End - Readded from Smartwire Revert
+/obj/item/mecha_parts/mecha_equipment/salvage_saw
+ name = "109-C Salvage Saw"
+ desc = "Equipment for cutting open walls and airlocks."
+ icon_state = "mecha_saw"
+ equip_cooldown = 5
+ energy_drain = 10
+ force = 15
+ var/dam_force = 30
+ harmful = TRUE
+ tool_behaviour = TOOL_DECONSTRUCT
+ toolspeed = 0.5
+ var/datum/effect_system/spark_spread/spark_system
+
+/obj/item/mecha_parts/mecha_equipment/salvage_saw/can_attach(obj/mecha/M as obj)
+ if(..())
+ if(istype(M, /obj/mecha/working) || istype(M, /obj/mecha/combat))
+ return 1
+ return 0
+
+/obj/item/mecha_parts/mecha_equipment/salvage_saw/attach()
+ ..()
+ toolspeed = 0.5
+ return
+
+/obj/item/mecha_parts/mecha_equipment/salvage_saw/detach()
+ ..()
+ toolspeed = 10 //yeah sure, use a mech tool without a mech. see how far that gets you
+ return ..()
+
+/obj/item/mecha_parts/mecha_equipment/salvage_saw/action(atom/target)
+ if(!action_checks(target))
+ return
+ if(isliving(target))
+ if(chassis.occupant.a_intent == INTENT_HARM)
+ var/mob/living/M = target
+ saw_mob(M, chassis.occupant)
+ return
+ else
+ target.add_overlay(GLOB.cutting_effect)
+ if(target.deconstruct_act(chassis.occupant, src))
+ do_sparks(2, TRUE, src)
+ chassis.stopped--
+ target.cut_overlay(GLOB.cutting_effect)
+ if(!chassis.stopped)
+ occupant_message("[src] finishes cutting, allowing movement again.")
+
+/obj/item/mecha_parts/mecha_equipment/salvage_saw/tool_start_check(user, amount)
+ if(!chassis.stopped)
+ occupant_message("[src] begins cutting, locking in place!")
+ chassis.stopped++
+ return TRUE
+
+/obj/item/mecha_parts/mecha_equipment/salvage_saw/proc/saw_mob(mob/living/target, mob/user)
+ target.visible_message("[chassis] is sawing [target] with [src]!", \
+ "[chassis] is sawing you with [src]!")
+ if(!do_after_cooldown(target))
+ return
+ log_combat(user, target, "sawed", "[name]", "(INTENT: [uppertext(user.a_intent)]) (DAMTYPE: [uppertext(damtype)])")
+ if(target.stat == DEAD && target.getBruteLoss() >= 400)
+ log_combat(user, target, "gibbed", name)
+ target.gib()
+ else
+ var/obj/item/bodypart/target_part = target.get_bodypart(ran_zone(BODY_ZONE_CHEST))
+ target.apply_damage(15, BRUTE, BODY_ZONE_CHEST, target.run_armor_check(target_part, "melee"))
+
+ //blood splatters
+ var/splatter_dir = get_dir(chassis, target)
+ if(isalien(target))
+ new /obj/effect/temp_visual/dir_setting/bloodsplatter/xenosplatter(target.drop_location(), splatter_dir)
+ else
+ var/splatter_color = null
+ if(iscarbon(target))
+ var/mob/living/carbon/carbon_target = target
+ splatter_color = carbon_target.dna.blood_type.color
+ new /obj/effect/temp_visual/dir_setting/bloodsplatter(target.drop_location(), splatter_dir, splatter_color)
+
+ //organs go everywhere
+ if(target_part && prob(10))
+ target_part.dismember(BRUTE)
+
//Dunno where else to put this so shrug
/obj/item/mecha_parts/mecha_equipment/conversion_kit
name = "Exosuit Conversion Kit"
@@ -575,3 +655,10 @@
icon_state = "clipupgrade"
source_mech = list(/obj/mecha/combat/durand)
result_mech = /obj/mecha/combat/durand/clip
+
+/obj/item/mecha_parts/mecha_equipment/conversion_kit/inteq_gygax
+ name = "IRMG Basenji Conversion Kit"
+ desc = "An IRMG-custom conversion kit for a Gygax combat exosuit, to convert it to the specialized Pyrnese breaching exosuit."
+ source_mech = list(/obj/mecha/combat/gygax,/obj/mecha/combat/gygax/dark)
+ result_mech = /obj/mecha/combat/gygax/inteq
+
diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm
index a1b46fd2fbfa..eba4801ba56d 100644
--- a/code/game/mecha/mecha.dm
+++ b/code/game/mecha/mecha.dm
@@ -15,6 +15,7 @@
light_on = FALSE
var/ruin_mecha = FALSE //if the mecha starts on a ruin, don't automatically give it a tracking beacon to prevent metagaming.
var/can_move = 0 //time of next allowed movement
+ var/stopped = FALSE
var/mob/living/carbon/occupant = null
var/step_in = 10 //make a step in step_in/10 sec.
var/dir_in = 2//What direction will the mech face when entered/powered on? Defaults to South.
@@ -41,6 +42,16 @@
var/last_user_hud = 1 // used to show/hide the mecha hud while preserving previous preference
var/completely_disabled = FALSE //stops the mech from doing anything
+ ///Vars for mech charges
+ var/charging = FALSE
+ var/charge_ready = TRUE
+ var/charge_cooldown = 50
+ var/charge_power_consume = 200
+ var/charge_distance = 5
+ var/charge_break_walls = FALSE
+ var/charge_toss_structures = FALSE
+ var/charge_toss_mobs = FALSE
+
var/bumpsmash = 0 //Whether or not the mech destroys walls by running into it.
//inner atmos
var/use_internal_tank = 0
@@ -90,6 +101,7 @@
var/datum/action/innate/mecha/mech_view_stats/stats_action = new
var/datum/action/innate/mecha/mech_defense_mode/defense_action = new
var/datum/action/innate/mecha/mech_overload_mode/overload_action = new
+ var/datum/action/innate/mecha/mech_charge_mode/charge_action = new
var/datum/effect_system/smoke_spread/smoke_system = new //not an action, but trigged by one
var/datum/action/innate/mecha/mech_smoke/smoke_action = new
var/datum/action/innate/mecha/mech_zoom/zoom_action = new
@@ -585,6 +597,8 @@
/obj/mecha/proc/domove(direction)
if(can_move >= world.time)
return 0
+ if(stopped)
+ return 0
if(!Process_Spacemove(direction))
return 0
if(!has_charge(step_energy_drain))
@@ -643,6 +657,7 @@
step_silent = FALSE
/obj/mecha/Bump(atom/obstacle)
+ var/atom/throw_target = get_edge_target_turf(obstacle, dir)
if(phasing && get_charge() >= phasing_energy_drain && !throwing)
if(!can_move)
return
@@ -654,6 +669,27 @@
forceMove(get_step(src,dir))
use_power(phasing_energy_drain)
addtimer(VARSET_CALLBACK(src, can_move, TRUE), step_in*3)
+ else if(charging)
+ if(charge_break_walls && iswallturf(obstacle))
+ var/turf/closed/wall/crushed = obstacle
+ playsound(src, 'sound/effects/meteorimpact.ogg', 100, TRUE)
+ visible_message(span_danger("[src] smashes through [obstacle]"))
+ crushed.dismantle_wall(TRUE)
+ if(isobj(obstacle))
+ var/obj/object = obstacle
+ obstacle.mech_melee_attack(src)
+ if(!(object.resistance_flags & INDESTRUCTIBLE) && charge_toss_structures)
+ object.throw_at(throw_target, 4, 3)
+ visible_message(span_danger("[src] crashes into [obstacle]!"))
+ playsound(src, 'sound/effects/bang.ogg', 50, TRUE)
+ if(ishuman(obstacle))
+ var/mob/living/carbon/human/H = obstacle
+ H.throw_at(throw_target,4,3)
+ visible_message(span_danger("[src] slams into \the [obstacle], sending [obstacle.p_them()] flying!"))
+ playsound(H, 'sound/effects/bang.ogg', 100, FALSE, -1)
+ H.Paralyze(20)
+ H.adjustStaminaLoss(30)
+ H.apply_damage(rand(20,35), BRUTE)
else
if(..()) //mech was thrown
return
@@ -1212,3 +1248,30 @@ GLOBAL_VAR_INIT(year_integer, text2num(year)) // = 2013???
else
to_chat(user, "None of the equipment on this exosuit can use this ammo!")
return FALSE
+
+
+///////////////////////
+////// Charging /////
+///////////////////////
+
+/obj/mecha/proc/start_charge()
+ Shake(15, 15, 1 SECONDS)
+ var/obj/effect/temp_visual/decoy/new_decoy = new /obj/effect/temp_visual/decoy(loc,src)
+ animate(new_decoy, alpha = 0, color = "#5a5858", transform = matrix()*2, time = 2)
+ addtimer(CALLBACK(src,PROC_REF(handle_charge)),0.5 SECONDS, TIMER_STOPPABLE)
+
+/obj/mecha/proc/handle_charge()
+ var/turf/mecha_loc = get_turf(src)
+ charging = TRUE
+ var/turf/charge_target = get_ranged_target_turf(mecha_loc,dir,charge_distance)
+ if(!charge_target)
+ charging = FALSE
+ return
+ cell.use(charge_power_consume)
+ walk_towards(src, charge_target, 0.7)
+ sleep(get_dist(src, charge_target) * 0.7)
+ charge_end()
+
+/obj/mecha/proc/charge_end()
+ walk(src,0)
+ charging = FALSE
diff --git a/code/game/mecha/mecha_actions.dm b/code/game/mecha/mecha_actions.dm
index 6d860558a652..f10fb49c29bc 100644
--- a/code/game/mecha/mecha_actions.dm
+++ b/code/game/mecha/mecha_actions.dm
@@ -183,6 +183,20 @@
chassis.occupant_message("You disable leg actuators overload.")
UpdateButtonIcon()
+/datum/action/innate/mecha/mech_charge_mode
+ name = "Charge"
+ button_icon_state = "mech_overload_off"
+
+/datum/action/innate/mecha/mech_charge_mode/Activate()
+ if(!owner || !chassis || chassis.occupant != owner)
+ return
+ if(chassis.charge_ready && !chassis.charging)
+ chassis.start_charge()
+ chassis.charge_ready = FALSE
+ addtimer(VARSET_CALLBACK(chassis, charge_ready, TRUE), chassis.charge_cooldown)
+ else
+ chassis.occupant_message(span_warning("The leg actuators are still recharging!"))
+
/datum/action/innate/mecha/mech_smoke
name = "Smoke"
button_icon_state = "mech_smoke"
diff --git a/code/game/mecha/mecha_construction_paths.dm b/code/game/mecha/mecha_construction_paths.dm
index 5172619ba022..7a3c67140b5e 100644
--- a/code/game/mecha/mecha_construction_paths.dm
+++ b/code/game/mecha/mecha_construction_paths.dm
@@ -760,10 +760,6 @@
list(
"key" = /obj/item/bikehorn
),
- list(
- "key" = /obj/item/clothing/shoes/clown_shoes,
- "action" = ITEM_DELETE
- ),
list(
"key" = /obj/item/bikehorn
),
diff --git a/code/game/objects/effects/contraband.dm b/code/game/objects/effects/contraband.dm
index 267e6bb24f4e..1227ff3847b3 100644
--- a/code/game/objects/effects/contraband.dm
+++ b/code/game/objects/effects/contraband.dm
@@ -519,7 +519,7 @@
/obj/structure/sign/poster/contraband/m90
name = "M90 SMG"
desc = "A poster advertising the Scarborough M90. Burst action with a grenade launcher, for some reason."
- icon_state = "poster-bulldog"
+ icon_state = "poster-m90"
/obj/structure/sign/poster/contraband/inteq_nt
name = "Inteq Recruitment"
diff --git a/code/game/objects/effects/decals/cleanable.dm b/code/game/objects/effects/decals/cleanable.dm
index 4161403fefd9..3ec6f58aa7b1 100644
--- a/code/game/objects/effects/decals/cleanable.dm
+++ b/code/game/objects/effects/decals/cleanable.dm
@@ -89,8 +89,9 @@
/obj/effect/decal/cleanable/wash(clean_types)
..()
if(!(flags_1 & INITIALIZED_1))
- return FALSE
- qdel(src)
+ return
+ if(clean_types in list(CLEAN_WASH, CLEAN_SCRUB))
+ qdel(src)
return TRUE
/obj/effect/decal/cleanable/proc/can_bloodcrawl_in()
diff --git a/code/game/objects/effects/decals/turfdecal/flooring_decals.dm b/code/game/objects/effects/decals/turfdecal/flooring_decals.dm
index fc23ed89c278..a2ec15e5022f 100644
--- a/code/game/objects/effects/decals/turfdecal/flooring_decals.dm
+++ b/code/game/objects/effects/decals/turfdecal/flooring_decals.dm
@@ -166,7 +166,7 @@ TURF_DECAL_COLOR_HELPER(transparent/lightgrey, "#a8b2b6", 140)
TURF_DECAL_COLOR_HELPER(transparent/bottlegreen, "#57967f", 140)
TURF_DECAL_COLOR_HELPER(transparent/ntblue, "#283674", 140)
TURF_DECAL_COLOR_HELPER(transparent/nsorange, "#FF6600", 140)
-TURF_DECAL_COLOR_HELPER(opaque/vired, "#d40000", 140)
+TURF_DECAL_COLOR_HELPER(transparent/vired, "#d40000", 140)
TURF_DECAL_COLOR_HELPER(transparent/solgovblue, "#2d2a4e", 140)
TURF_DECAL_COLOR_HELPER(transparent/solgovgold, "#eeac2e", 140)
TURF_DECAL_COLOR_HELPER(transparent/syndiered, "#730622", 140)
diff --git a/code/game/objects/effects/effect_system/effects_foam.dm b/code/game/objects/effects/effect_system/effects_foam.dm
index 51020d8f60dc..5fedeb47e455 100644
--- a/code/game/objects/effects/effect_system/effects_foam.dm
+++ b/code/game/objects/effects/effect_system/effects_foam.dm
@@ -48,13 +48,11 @@
/obj/effect/particle_effect/foam/firefighting/kill_foam()
STOP_PROCESSING(SSfastprocess, src)
-
if(absorbed_plasma)
var/obj/effect/decal/cleanable/plasma/P = (locate(/obj/effect/decal/cleanable/plasma) in get_turf(src))
if(!P)
P = new(loc)
P.reagents.add_reagent(/datum/reagent/stable_plasma, absorbed_plasma)
-
flick("[icon_state]-disolve", src)
QDEL_IN(src, 5)
@@ -67,6 +65,33 @@
/obj/effect/particle_effect/foam/firefighting/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
return
+
+/obj/effect/particle_effect/foam/antirad
+ name = "antiradiation foam"
+ lifetime = 80
+ amount = 0 //no spread
+ slippery_foam = FALSE
+ color = "#A6FAFF55"
+
+
+/obj/effect/particle_effect/foam/antirad/process()
+ ..()
+
+ var/turf/open/T = get_turf(src)
+ var/obj/effect/radiation/rads = (locate(/obj/effect/radiation) in T)
+ if(rads && istype(T))
+ rads.rad_power = rads.rad_power * rand(0.8, 0.95)
+ if (rads.rad_power <= RAD_BACKGROUND_RADIATION)
+ new /obj/effect/decal/cleanable/greenglow/filled(loc)
+ qdel(rads)
+ for(var/obj/things in get_turf(src))
+ things.wash(CLEAN_TYPE_RADIATION)
+
+/obj/effect/particle_effect/foam/antirad/kill_foam()
+ STOP_PROCESSING(SSfastprocess, src)
+ flick("[icon_state]-disolve", src)
+ QDEL_IN(src, 5)
+
/obj/effect/particle_effect/foam/metal
name = "aluminium foam"
metal = ALUMINIUM_FOAM
diff --git a/code/game/objects/effects/spawners/bundle.dm b/code/game/objects/effects/spawners/bundle.dm
index edab392613f3..e4f36e8b827d 100644
--- a/code/game/objects/effects/spawners/bundle.dm
+++ b/code/game/objects/effects/spawners/bundle.dm
@@ -12,13 +12,6 @@
for(var/path in items)
new path(loc)
-/obj/effect/spawner/bundle/costume/chicken
- name = "chicken costume spawner"
- items = list(
- /obj/item/clothing/suit/chickensuit,
- /obj/item/clothing/head/chicken,
- /obj/item/reagent_containers/food/snacks/egg)
-
/obj/effect/spawner/bundle/costume/gladiator
name = "gladiator costume spawner"
items = list(
@@ -72,7 +65,6 @@
name = "prig costume spawner"
items = list(
/obj/item/clothing/accessory/waistcoat,
- /obj/item/clothing/glasses/monocle,
/obj/effect/spawner/lootdrop/minor/bowler_or_that,
/obj/item/clothing/shoes/sneakers/black,
/obj/item/cane,
@@ -83,7 +75,6 @@
name = "plague doctor costume spawner"
items = list(
/obj/item/clothing/suit/bio_suit/plaguedoctorsuit,
- /obj/item/clothing/head/plaguedoctorhat,
/obj/item/clothing/mask/gas/plaguedoctor)
/obj/effect/spawner/bundle/costume/nightowl
@@ -108,39 +99,12 @@
/obj/effect/spawner/lootdrop/minor/pirate_or_bandana,
/obj/item/clothing/glasses/eyepatch)
-/obj/effect/spawner/bundle/costume/imperium_monk
- name = "imperium monk costume spawner"
- items = list(
- /obj/item/clothing/suit/imperium_monk,
- /obj/effect/spawner/lootdrop/minor/twentyfive_percent_cyborg_mask)
-
-/obj/effect/spawner/bundle/costume/holiday_priest
- name = "holiday priest costume spawner"
- items = list(
- /obj/item/clothing/suit/chaplainsuit/holidaypriest)
-
-/obj/effect/spawner/bundle/costume/marisawizard
- name = "marisa wizard costume spawner"
- items = list(
- /obj/item/clothing/shoes/sandal/marisa,
- /obj/item/clothing/head/wizard/marisa/fake,
- /obj/item/clothing/suit/wizrobe/marisa/fake)
-
/obj/effect/spawner/bundle/costume/cutewitch
name = "cute witch costume spawner"
items = list(
/obj/item/clothing/under/dress/sundress,
- /obj/item/clothing/head/witchwig,
/obj/item/staff/broom)
-/obj/effect/spawner/bundle/costume/wizard
- name = "wizard costume spawner"
- items = list(
- /obj/item/clothing/shoes/sandal,
- /obj/item/clothing/suit/wizrobe/fake,
- /obj/item/clothing/head/wizard/fake,
- /obj/item/staff)
-
/obj/effect/spawner/bundle/costume/mafia
name = "black mafia outfit spawner"
items = list(
diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm
index 2caecd950a9f..364ddeb72298 100644
--- a/code/game/objects/effects/spawners/lootdrop.dm
+++ b/code/game/objects/effects/spawners/lootdrop.dm
@@ -279,20 +279,17 @@
/obj/effect/spawner/lootdrop/minor/beret_or_rabbitears
name = "beret or rabbit ears spawner"
loot = list(
- /obj/item/clothing/head/beret = 1,
- /obj/item/clothing/head/rabbitears = 1)
+ /obj/item/clothing/head/beret = 1)
/obj/effect/spawner/lootdrop/minor/bowler_or_that
name = "bowler or top hat spawner"
loot = list(
- /obj/item/clothing/head/bowler = 1,
/obj/item/clothing/head/that = 1)
/obj/effect/spawner/lootdrop/minor/kittyears_or_rabbitears
name = "kitty ears or rabbit ears spawner"
loot = list(
- /obj/item/clothing/head/kitty = 1,
- /obj/item/clothing/head/rabbitears = 1)
+ /obj/item/clothing/head/kitty = 1)
/obj/effect/spawner/lootdrop/minor/pirate_or_bandana
name = "pirate hat or bandana spawner"
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index a1302008cf89..90669dde84bb 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -2,6 +2,10 @@ GLOBAL_DATUM_INIT(fire_overlay, /mutable_appearance, mutable_appearance('icons/e
GLOBAL_DATUM_INIT(welding_sparks, /mutable_appearance, mutable_appearance('icons/effects/welding_effect.dmi', "welding_sparks", GASFIRE_LAYER, ABOVE_LIGHTING_PLANE))
+GLOBAL_DATUM_INIT(cutting_effect, /mutable_appearance, mutable_appearance('icons/effects/cutting_effect.dmi', "cutting_effect", GASFIRE_LAYER, ABOVE_LIGHTING_PLANE))
+
+GLOBAL_DATUM_INIT(advanced_cutting_effect, /mutable_appearance, mutable_appearance('icons/effects/cutting_effect.dmi', "advanced_cutting_effect", GASFIRE_LAYER, ABOVE_LIGHTING_PLANE))
+
GLOBAL_DATUM_INIT(cleaning_bubbles, /mutable_appearance, mutable_appearance('icons/effects/effects.dmi', "bubbles", ABOVE_MOB_LAYER, GAME_PLANE))
GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
@@ -26,8 +30,7 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb
var/supports_variations = null
///If set, kepori wearing this use this instead of their clothing file
- var/kepoi_override_icon
-
+ var/kepori_override_icon
///If set, vox wearing this use this instead of their clothing file
var/vox_override_icon
diff --git a/code/game/objects/items/defib.dm b/code/game/objects/items/defib.dm
index 32a62880d69c..640b4e4a6a0a 100644
--- a/code/game/objects/items/defib.dm
+++ b/code/game/objects/items/defib.dm
@@ -302,24 +302,12 @@
var/obj/item/defibrillator/defib
var/req_defib = TRUE
var/combat = FALSE //If it penetrates armor and gives additional functionality
- var/wielded = FALSE // track wielded status on item
/obj/item/shockpaddles/ComponentInitialize()
. = ..()
AddElement(/datum/element/update_icon_updates_onmob)
AddComponent(/datum/component/two_handed, force_unwielded=8, force_wielded=12)
-/// triggered on wield of two handed item
-/obj/item/shockpaddles/proc/on_wield(obj/item/source, mob/user)
- SIGNAL_HANDLER
-
- wielded = TRUE
-
-/// triggered on unwield of two handed item
-/obj/item/shockpaddles/proc/on_unwield(obj/item/source, mob/user)
- SIGNAL_HANDLER
-
- wielded = FALSE
/obj/item/shockpaddles/Destroy()
defib = null
@@ -369,8 +357,6 @@
/obj/item/shockpaddles/Initialize()
. = ..()
ADD_TRAIT(src, TRAIT_NO_STORAGE_INSERT, GENERIC_ITEM_TRAIT) //stops shockpaddles from being inserted in BoH
- RegisterSignal(src, COMSIG_TWOHANDED_WIELD, PROC_REF(on_wield))
- RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, PROC_REF(on_unwield))
if(!req_defib)
return //If it doesn't need a defib, just say it exists
if (!loc || !istype(loc, /obj/item/defibrillator)) //To avoid weird issues from admin spawns
@@ -380,10 +366,10 @@
update_appearance()
/obj/item/shockpaddles/update_icon_state()
- icon_state = "[base_icon_state][wielded]"
+ icon_state = "[base_icon_state][HAS_TRAIT(src, TRAIT_WIELDED)]"
item_state = icon_state
if(cooldown)
- icon_state = "[base_icon_state][wielded]_cooldown"
+ icon_state = "[base_icon_state][HAS_TRAIT(src, TRAIT_WIELDED)]_cooldown"
return ..()
/obj/item/shockpaddles/dropped(mob/user)
@@ -410,7 +396,7 @@
user.visible_message("[defib] beeps: Unit is unpowered.")
playsound(src, 'sound/machines/defib_failed.ogg', 50, FALSE)
return
- if(!wielded)
+ if(!HAS_TRAIT(src, TRAIT_WIELDED))
if(iscyborg(user))
to_chat(user, "You must activate the paddles in your active module before you can use them on someone!")
else
diff --git a/code/game/objects/items/devices/PDA/PDA_types.dm b/code/game/objects/items/devices/PDA/PDA_types.dm
index c8a918732a9d..4a7817c5eb60 100644
--- a/code/game/objects/items/devices/PDA/PDA_types.dm
+++ b/code/game/objects/items/devices/PDA/PDA_types.dm
@@ -10,7 +10,6 @@
/obj/item/pda/clown/ComponentInitialize()
. = ..()
- AddComponent(/datum/component/slippery/clowning, 120, NO_SLIP_WHEN_WALKING, CALLBACK(src, PROC_REF(AfterSlip)))
AddComponent(/datum/component/wearertargeting/sitcomlaughter, CALLBACK(src, PROC_REF(after_sitcom_laugh)))
/obj/item/pda/clown/proc/AfterSlip(mob/living/carbon/human/M)
diff --git a/code/game/objects/items/devices/reverse_bear_trap.dm b/code/game/objects/items/devices/reverse_bear_trap.dm
deleted file mode 100644
index 5d90c839bebf..000000000000
--- a/code/game/objects/items/devices/reverse_bear_trap.dm
+++ /dev/null
@@ -1,130 +0,0 @@
-/obj/item/reverse_bear_trap
- name = "reverse bear trap"
- desc = "A horrifying set of shut metal jaws, rigged to a kitchen timer and secured by padlock to a head-mounted clamp. To apply, hit someone with it."
- icon = 'icons/obj/device.dmi'
- icon_state = "reverse_bear_trap"
- slot_flags = ITEM_SLOT_HEAD
- flags_1 = CONDUCT_1
- resistance_flags = FIRE_PROOF | UNACIDABLE
- w_class = WEIGHT_CLASS_NORMAL
- obj_integrity = 300
- max_integrity = 300
- item_state = "rack_parts"
- lefthand_file = 'icons/mob/inhands/items_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/items_righthand.dmi'
-
- var/ticking = FALSE
- var/time_left = 60 //seconds remaining until pop
- var/escape_chance = 0 //chance per "fiddle" to get the trap off your head
- var/struggling = FALSE
-
- var/time_since_last_beep = 0
- var/datum/looping_sound/reverse_bear_trap/soundloop
- var/datum/looping_sound/reverse_bear_trap_beep/soundloop2
-
-/obj/item/reverse_bear_trap/Initialize()
- . = ..()
- soundloop = new(list(src))
- soundloop2 = new(list(src))
-
-/obj/item/reverse_bear_trap/Destroy()
- QDEL_NULL(soundloop)
- QDEL_NULL(soundloop2)
- STOP_PROCESSING(SSprocessing, src)
- return ..()
-
-/obj/item/reverse_bear_trap/process()
- if(!ticking)
- return
- time_left--
- soundloop2.mid_length = max(0.5, time_left - 5) //beepbeepbeepbeepbeep
- if(!time_left || !isliving(loc))
- playsound(src, 'sound/machines/microwave/microwave-end.ogg', 100, FALSE)
- soundloop.stop()
- soundloop2.stop()
- to_chat(loc, "*ding*")
- addtimer(CALLBACK(src, PROC_REF(snap)), 2)
-
-/obj/item/reverse_bear_trap/attack_hand(mob/user)
- if(iscarbon(user))
- var/mob/living/carbon/C = user
- if(C.get_item_by_slot(ITEM_SLOT_HEAD) == src)
- if(HAS_TRAIT_FROM(src, TRAIT_NODROP, REVERSE_BEAR_TRAP_TRAIT) && !struggling)
- struggling = TRUE
- var/fear_string
- switch(time_left)
- if(0 to 5)
- fear_string = "agonizingly"
- if(5 to 20)
- fear_string = "desperately"
- if(20 to 40)
- fear_string = "panickedly"
- if(40 to 50)
- fear_string = "shakily"
- if(50 to 60)
- fear_string = ""
- C.visible_message("[C] fiddles with and pulls at [src]...", \
- "You [fear_string] try to pull at [src]...", "You hear clicking and ticking.")
- if(!do_after(user, 20, target = src))
- struggling = FALSE
- return
- if(!prob(escape_chance))
- to_chat(user, "It doesn't budge!")
- escape_chance++
- else
- user.visible_message("The lock on [user]'s [name] pops open!", \
- "You force open the padlock!", "You hear a single, pronounced click!")
- REMOVE_TRAIT(src, TRAIT_NODROP, REVERSE_BEAR_TRAP_TRAIT)
- struggling = FALSE
- return
- ..()
-
-/obj/item/reverse_bear_trap/attack(mob/living/target, mob/living/user)
- if(target.get_item_by_slot(ITEM_SLOT_HEAD))
- to_chat(user, "Remove [target.p_their()] headgear first!")
- return
- target.visible_message("[user] starts forcing [src] onto [target]'s head!", \
- "[target] starts forcing [src] onto your head!", "You hear clanking.")
- to_chat(user, "You start forcing [src] onto [target]'s head...")
- if(!do_after(user, 30, target = target) || target.get_item_by_slot(ITEM_SLOT_HEAD))
- return
- target.visible_message("[user] forces and locks [src] onto [target]'s head!", \
- "[target] locks [src] onto your head!", "You hear a click, and then a timer ticking down.")
- to_chat(user, "You force [src] onto [target]'s head and click the padlock shut.")
- user.dropItemToGround(src)
- target.equip_to_slot_if_possible(src, ITEM_SLOT_HEAD)
- arm()
- notify_ghosts("[user] put a reverse bear trap on [target]!", source = src, action = NOTIFY_ORBIT, flashwindow = FALSE, ghost_sound = 'sound/machines/beep.ogg', notify_volume = 75, header = "Reverse bear trap armed")
-
-/obj/item/reverse_bear_trap/proc/snap()
- reset()
- var/mob/living/carbon/human/H = loc
- if(!istype(H) || H.get_item_by_slot(ITEM_SLOT_HEAD) != src)
- visible_message("[src]'s jaws snap open with an ear-piercing crack!")
- playsound(src, 'sound/effects/snap.ogg', 75, TRUE)
- else
- var/mob/living/carbon/human/jill = loc
- jill.visible_message("[src] goes off in [jill]'s mouth, ripping [jill.p_their()] head apart!", "[src] goes off!")
- jill.emote("scream")
- playsound(src, 'sound/effects/snap.ogg', 75, TRUE, frequency = 0.5)
- playsound(src, 'sound/effects/splat.ogg', 50, TRUE, frequency = 0.5)
- jill.apply_damage(9999, BRUTE, BODY_ZONE_HEAD)
- jill.death() //just in case, for some reason, they're still alive
- flash_color(jill, flash_color = "#FF0000", flash_time = 100)
-
-/obj/item/reverse_bear_trap/proc/reset()
- ticking = FALSE
- REMOVE_TRAIT(src, TRAIT_NODROP, REVERSE_BEAR_TRAP_TRAIT)
- soundloop.stop()
- soundloop2.stop()
- STOP_PROCESSING(SSprocessing, src)
-
-/obj/item/reverse_bear_trap/proc/arm() //hulen
- ticking = TRUE
- escape_chance = initial(escape_chance) //we keep these vars until re-arm, for tracking purposes
- time_left = initial(time_left)
- ADD_TRAIT(src, TRAIT_NODROP, REVERSE_BEAR_TRAP_TRAIT)
- soundloop.start()
- soundloop2.mid_length = initial(soundloop2.mid_length)
- soundloop2.start()
- START_PROCESSING(SSprocessing, src)
diff --git a/code/game/objects/items/food/cake.dm b/code/game/objects/items/food/cake.dm
index d6299a24d524..12445d50d8f2 100644
--- a/code/game/objects/items/food/cake.dm
+++ b/code/game/objects/items/food/cake.dm
@@ -212,10 +212,6 @@
foodtypes = GRAIN | DAIRY | JUNKFOOD | SUGAR
slice_type = /obj/item/food/cakeslice/birthday
-/obj/item/food/cake/birthday/microwave_act(obj/machinery/microwave/M) //super sekrit club
- new /obj/item/clothing/head/hardhat/cakehat(get_turf(src))
- qdel(src)
-
/obj/item/food/cakeslice/birthday
name = "birthday cake slice"
desc = "A slice of your birthday."
@@ -244,10 +240,6 @@
tastes = list("cake" = 3, "a Vlad's Salad" = 1)
slice_type = /obj/item/food/cakeslice/birthday/energy
-/obj/item/food/cake/birthday/energy/microwave_act(obj/machinery/microwave/M) //super sekriter club
- new /obj/item/clothing/head/hardhat/cakehat/energycake(get_turf(src))
- qdel(src)
-
/obj/item/food/cake/birthday/energy/proc/energy_bite(mob/living/user)
to_chat(user, "As you eat the cake, you accidentally hurt yourself on the embedded energy sword!")
user.apply_damage(30, BURN, BODY_ZONE_HEAD) // ITs an ENERGY sword, so it burns, duh
diff --git a/code/game/objects/items/gear_packs.dm b/code/game/objects/items/gear_packs.dm
new file mode 100644
index 000000000000..65db4ffa28c9
--- /dev/null
+++ b/code/game/objects/items/gear_packs.dm
@@ -0,0 +1,285 @@
+/obj/item/gear_pack
+ name = "gear pack"
+ desc = "A large backpack that usually holds things"
+ icon = 'icons/obj/hydroponics/equipment.dmi'
+ icon_state = "waterbackpack"
+ item_state = "waterbackpack"
+ lefthand_file = 'icons/mob/inhands/equipment/backpack_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/equipment/backpack_righthand.dmi'
+ w_class = WEIGHT_CLASS_HUGE
+ slot_flags = ITEM_SLOT_BACK
+ item_flags = SLOWS_WHILE_IN_HAND
+ max_integrity = 300
+ slowdown = 1
+ drag_slowdown = 1
+ actions_types = list(/datum/action/item_action/toggle_gear_handle)
+ max_integrity = 200
+ armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 30)
+ resistance_flags = FIRE_PROOF
+ var/on = FALSE
+ var/obj/item/stock_parts/cell/cell
+ var/preload_cell_type = /obj/item/stock_parts/cell/high
+ var/powered = FALSE
+ var/activate_sound = "sparks"
+ var/obj/item/gear_handle/gear_handle_type = /obj/item/gear_handle
+ var/obj/item/gear_handle/gear_handle
+
+/obj/item/gear_pack/get_cell()
+ return cell
+
+/obj/item/gear_pack/Initialize()
+ . = ..()
+ drag_slowdown = slowdown
+ gear_handle = new gear_handle_type(src)
+ cell = new preload_cell_type(src)
+ update_power()
+ return
+
+/obj/item/gear_pack/examine(mob/user)
+ . = ..()
+ . += "It is [ on ? "currently" : "not"] active."
+ if(cell)
+ . += "A small readout reports [PERCENT(cell.charge / cell.maxcharge)]% charge."
+
+/obj/item/gear_pack/fire_act(exposed_temperature, exposed_volume)
+ . = ..()
+ if(gear_handle?.loc == src)
+ gear_handle.fire_act(exposed_temperature, exposed_volume)
+
+/obj/item/gear_pack/extinguish()
+ . = ..()
+ if(gear_handle?.loc == src)
+ gear_handle.extinguish()
+
+/obj/item/gear_pack/proc/update_power()
+ if(!QDELETED(cell))
+ if(QDELETED(gear_handle) || cell.charge < gear_handle.usecost)
+ powered = FALSE
+ else
+ powered = TRUE
+ else
+ powered = FALSE
+ update_icon()
+
+/obj/item/gear_pack/update_overlays()
+ . = ..()
+
+ if(powered)
+ . += "[initial(icon_state)]-powered"
+ if(!QDELETED(cell))
+ var/ratio = cell.charge / cell.maxcharge
+ ratio = CEILING(ratio*4, 1) * 25
+ . += "[initial(icon_state)]-charge[ratio]"
+ if(!cell)
+ . += "[initial(icon_state)]-nocell"
+ if(!on)
+ . += "[initial(icon_state)]-attachment"
+
+/obj/item/gear_pack/CheckParts(list/parts_list)
+ ..()
+ cell = locate(/obj/item/stock_parts/cell) in contents
+ update_power()
+
+/obj/item/gear_pack/ui_action_click()
+ toggle_gear_handle()
+
+//ATTACK HAND IGNORING PARENT RETURN VALUE
+/obj/item/gear_pack/attack_hand(mob/user)
+ if(loc == user)
+ if(slot_flags == ITEM_SLOT_BACK)
+ if(user.get_item_by_slot(ITEM_SLOT_BACK) == src)
+ ui_action_click()
+ else
+ to_chat(user, "Put the [src] on your back first!")
+
+ else if(slot_flags == ITEM_SLOT_BELT)
+ if(user.get_item_by_slot(ITEM_SLOT_BELT) == src)
+ ui_action_click()
+ else
+ to_chat(user, "Strap the [src]'s belt on first!")
+ return
+ return ..()
+
+/obj/item/gear_pack/MouseDrop(obj/over_object)
+ . = ..()
+ if(ismob(loc))
+ var/mob/M = loc
+ if(!M.incapacitated() && istype(over_object, /atom/movable/screen/inventory/hand))
+ var/atom/movable/screen/inventory/hand/H = over_object
+ M.putItemFromInventoryInHandIfPossible(src, H.held_index)
+
+/obj/item/gear_pack/attackby(obj/item/W, mob/user, params)
+ if(W == gear_handle)
+ toggle_gear_handle()
+ else if(istype(W, /obj/item/stock_parts/cell))
+ var/obj/item/stock_parts/cell/C = W
+ if(cell)
+ to_chat(user, "[src] already has a cell!")
+ else
+ if(C.maxcharge < gear_handle.usecost)
+ to_chat(user, "[src] requires a higher capacity cell.")
+ return
+ if(!user.transferItemToLoc(W, src))
+ return
+ cell = W
+ to_chat(user, "You install a cell in [src].")
+ update_power()
+
+ else if(W.tool_behaviour == TOOL_SCREWDRIVER)
+ if(cell)
+ cell.update_icon()
+ cell.forceMove(get_turf(src))
+ cell = null
+ to_chat(user, "You remove the cell from [src].")
+ update_power()
+ else
+ return ..()
+
+/obj/item/gear_pack/emp_act(severity)
+ . = ..()
+ if(cell && !(. & EMP_PROTECT_CONTENTS))
+ deductcharge(1000 / severity)
+ if(. & EMP_PROTECT_SELF)
+ return
+ update_power()
+
+/obj/item/gear_pack/proc/toggle_gear_handle()
+ set name = "Toggle gear_handle"
+ set category = "Object"
+ on = !on
+
+ var/mob/living/carbon/user = usr
+ if(on)
+ //Detach the gear_handle into the user's hands
+ playsound(src, 'sound/items/handling/multitool_pickup.ogg', 100)
+ if(!usr.put_in_hands(gear_handle))
+ on = FALSE
+ to_chat(user, "You need a free hand to hold the [gear_handle]!")
+ update_power()
+ return
+ else
+ //Remove from their hands and back onto the gear pack
+ remove_gear_handle(user)
+
+ update_power()
+ for(var/X in actions)
+ var/datum/action/A = X
+ A.UpdateButtonIcon()
+
+
+/obj/item/gear_pack/equipped(mob/user, slot)
+ ..()
+ if((slot_flags == ITEM_SLOT_BACK && slot != ITEM_SLOT_BACK) || (slot_flags == ITEM_SLOT_BELT && slot != ITEM_SLOT_BELT))
+ remove_gear_handle(user)
+ update_power()
+
+/obj/item/gear_pack/item_action_slot_check(slot, mob/user)
+ if(slot == user.getBackSlot())
+ return 1
+
+/obj/item/gear_pack/proc/remove_gear_handle(mob/user)
+ if(ismob(gear_handle.loc))
+ var/mob/M = gear_handle.loc
+ M.dropItemToGround(gear_handle, TRUE)
+ return
+
+/obj/item/gear_pack/Destroy()
+ if(on)
+ var/M = get(gear_handle, /mob)
+ remove_gear_handle(M)
+ QDEL_NULL(gear_handle)
+ QDEL_NULL(cell)
+ return ..()
+
+/obj/item/gear_pack/proc/deductcharge(chrgdeductamt)
+ if(cell)
+ if(cell.charge < (gear_handle.usecost+chrgdeductamt))
+ powered = FALSE
+ update_power()
+ if(cell.use(chrgdeductamt))
+ update_power()
+ return TRUE
+ else
+ return FALSE
+
+/obj/item/gear_handle
+
+ name = "gear handle"
+ desc = "handles the gear."
+ icon = 'icons/obj/hydroponics/equipment.dmi'
+ icon_state = "mister"
+ item_state = "mister"
+ lefthand_file = 'icons/mob/inhands/equipment/mister_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/equipment/mister_righthand.dmi'
+
+ force = 0
+ throwforce = 6
+ w_class = WEIGHT_CLASS_BULKY
+ resistance_flags = INDESTRUCTIBLE
+ base_icon_state = "mister"
+
+ var/req_pack = TRUE
+ var/usecost = 1000
+ var/obj/item/gear_pack/pack
+
+/obj/item/gear_handle/Initialize()
+ . = ..()
+ ADD_TRAIT(src, TRAIT_NO_STORAGE_INSERT, GENERIC_ITEM_TRAIT)
+ if (!loc || !istype(loc, /obj/item/gear_pack))
+ return INITIALIZE_HINT_QDEL
+ if(!req_pack)
+ return
+ pack = loc
+ update_icon()
+
+/obj/item/gear_handle/Destroy()
+ pack = null
+ return ..()
+
+/obj/item/gear_handle/equipped(mob/user, slot)
+ . = ..()
+ if(!req_pack)
+ return
+ RegisterSignal(user, COMSIG_MOVABLE_MOVED, PROC_REF(check_range))
+
+/obj/item/gear_handle/Moved()
+ . = ..()
+ check_range()
+
+
+/obj/item/gear_handle/fire_act(exposed_temperature, exposed_volume)
+ . = ..()
+ if((req_pack && pack) && loc != pack)
+ pack.fire_act(exposed_temperature, exposed_volume)
+
+/obj/item/gear_handle/proc/check_range()
+ SIGNAL_HANDLER
+
+ if(!req_pack ||!pack)
+ return
+ if(!in_range(src,pack))
+ var/mob/living/L = loc
+ if(istype(L))
+ to_chat(L, "[pack]'s [src] overextends and comes out of your hands!")
+ else
+ visible_message("[src] snaps back into [pack].")
+ snap_back()
+
+/obj/item/gear_handle/dropped(mob/user)
+ . = ..()
+ if(!req_pack)
+ return ..()
+ if(user)
+ UnregisterSignal(user, COMSIG_MOVABLE_MOVED)
+ if(user != loc)
+ to_chat(user, "[src] snap back into the main unit.")
+ snap_back()
+ return
+
+/obj/item/gear_handle/proc/snap_back()
+ if(!pack)
+ return
+ playsound()
+ pack.on = FALSE
+ forceMove(pack)
+ pack.update_power()
diff --git a/code/game/objects/items/gift.dm b/code/game/objects/items/gift.dm
index 31ac7d44ecff..592a4f6364fb 100644
--- a/code/game/objects/items/gift.dm
+++ b/code/game/objects/items/gift.dm
@@ -74,10 +74,6 @@ GLOBAL_LIST_EMPTY(possible_gifts)
/obj/item/storage/belt/utility/full,
/obj/item/clothing/neck/tie/horrible,
/obj/item/clothing/suit/jacket/leather,
- /obj/item/clothing/suit/jacket/leather/overcoat,
- /obj/item/clothing/suit/poncho,
- /obj/item/clothing/suit/poncho/green,
- /obj/item/clothing/suit/poncho/red,
/obj/item/clothing/suit/snowman,
/obj/item/clothing/head/snowman,
/obj/item/stack/sheet/mineral/coal)
diff --git a/code/game/objects/items/grenades/chem_grenade.dm b/code/game/objects/items/grenades/chem_grenade.dm
index b675a0012152..e8b7e0de487f 100644
--- a/code/game/objects/items/grenades/chem_grenade.dm
+++ b/code/game/objects/items/grenades/chem_grenade.dm
@@ -207,7 +207,7 @@
desc = "A custom made large grenade. Larger splash range and increased ignition temperature compared to basic grenades. Fits exotic and bluespace based containers."
casedesc = "This casing affects a larger area than the basic model and can fit exotic containers, including slime cores and bluespace beakers. Heats contents by 25°K upon ignition."
icon_state = "large_grenade"
- allowed_containers = list(/obj/item/reagent_containers/glass, /obj/item/reagent_containers/food/condiment, /obj/item/reagent_containers/food/drinks)
+ allowed_containers = list(/obj/item/reagent_containers/glass, /obj/item/reagent_containers/condiment, /obj/item/reagent_containers/food/drinks)
banned_containers = list()
affected_area = 5
ignition_temp = 25 // Large grenades are slightly more effective at setting off heat-sensitive mixtures than smaller grenades.
diff --git a/code/game/objects/items/grenades/discogrenade.dm b/code/game/objects/items/grenades/discogrenade.dm
index c582a35e3ff3..b8f988f363fe 100644
--- a/code/game/objects/items/grenades/discogrenade.dm
+++ b/code/game/objects/items/grenades/discogrenade.dm
@@ -107,10 +107,6 @@
target.show_message(span_warning("You resist your inner urges to break out your best moves."), 2)
target.set_drugginess(5)
return
- if(istype(target.get_item_by_slot(ITEM_SLOT_HEAD), /obj/item/clothing/head/foilhat))
- to_chat(target, span_userdanger("BIG DISCO WON'T CORRUPT ME WITH THEIR POST ICW PSY-OP MUSIC!"))
- target.emote("scream")
- return
target.set_drugginess(10)
target.show_message(span_warning("You feel a strong rythme and your muscles spasm uncontrollably, you begin dancing and cannot move!"), 2)
diff --git a/code/game/objects/items/melee/chainsaw.dm b/code/game/objects/items/melee/chainsaw.dm
index 494ec65cdb5a..d179237f8559 100644
--- a/code/game/objects/items/melee/chainsaw.dm
+++ b/code/game/objects/items/melee/chainsaw.dm
@@ -22,30 +22,12 @@
tool_behaviour = TOOL_SAW
toolspeed = 0.5
var/on = FALSE
- var/wielded = FALSE // track wielded status on item
-
-/obj/item/chainsaw/Initialize()
- . = ..()
- RegisterSignal(src, COMSIG_TWOHANDED_WIELD, PROC_REF(on_wield))
- RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, PROC_REF(on_unwield))
/obj/item/chainsaw/ComponentInitialize()
. = ..()
AddComponent(/datum/component/butchering, 30, 100, 0, 'sound/weapons/chainsawhit.ogg', TRUE)
AddComponent(/datum/component/two_handed, require_twohands=TRUE)
-/// triggered on wield of two handed item
-/obj/item/chainsaw/proc/on_wield(obj/item/source, mob/user)
- SIGNAL_HANDLER
-
- wielded = TRUE
-
-/// triggered on unwield of two handed item
-/obj/item/chainsaw/proc/on_unwield(obj/item/source, mob/user)
- SIGNAL_HANDLER
-
- wielded = FALSE
-
/obj/item/chainsaw/attack_self(mob/user)
on = !on
to_chat(user, "As you pull the starting cord dangling from [src], [on ? "it begins to whirr." : "the chain stops moving."]")
@@ -67,7 +49,7 @@
A.UpdateButtonIcon()
/obj/item/chainsaw/get_dismemberment_chance()
- if(wielded)
+ if(HAS_TRAIT(src, TRAIT_WIELDED))
. = ..()
/obj/item/chainsaw/doomslayer
diff --git a/code/game/objects/items/melee/dualsaber.dm b/code/game/objects/items/melee/dualsaber.dm
index 965979db215a..28242c1006a1 100644
--- a/code/game/objects/items/melee/dualsaber.dm
+++ b/code/game/objects/items/melee/dualsaber.dm
@@ -28,7 +28,6 @@
var/two_hand_force = 34
var/hacked = FALSE
var/list/possible_colors = list("red", "blue", "green", "purple", "yellow")
- var/wielded = FALSE // track wielded status on item
/obj/item/dualsaber/ComponentInitialize()
. = ..()
@@ -43,7 +42,6 @@
if(user.dna.check_mutation(HULK))
to_chat(user, "You lack the grace to wield this!")
return COMPONENT_TWOHANDED_BLOCK_WIELD
- wielded = TRUE
sharpness = IS_SHARP
w_class = w_class_on
hitsound = 'sound/weapons/blade1.ogg'
@@ -56,16 +54,14 @@
/obj/item/dualsaber/proc/on_unwield(obj/item/source, mob/living/carbon/user)
SIGNAL_HANDLER
- wielded = FALSE
sharpness = initial(sharpness)
w_class = initial(w_class)
hitsound = "swing_hit"
STOP_PROCESSING(SSobj, src)
set_light_on(FALSE)
-
/obj/item/dualsaber/update_icon_state()
- icon_state = wielded ? "dualsaber[saber_color]" : "dualsaber"
+ icon_state = HAS_TRAIT(src, TRAIT_WIELDED) ? "dualsaber[saber_color]" : "dualsaber"
return ..()
/obj/item/dualsaber/Initialize()
@@ -94,14 +90,14 @@
if(user.has_dna())
if(user.dna.check_mutation(HULK))
to_chat(user, "You grip the blade too hard and accidentally drop it!")
- if(wielded)
+ if(HAS_TRAIT(src, TRAIT_WIELDED))
user.dropItemToGround(src, force=TRUE)
return
..()
- if(wielded && HAS_TRAIT(user, TRAIT_CLUMSY) && prob(40))
+ if(HAS_TRAIT(src, TRAIT_WIELDED) && HAS_TRAIT(user, TRAIT_CLUMSY) && prob(40))
impale(user)
return
- if(wielded && prob(50))
+ if(HAS_TRAIT(src, TRAIT_WIELDED) && prob(50))
INVOKE_ASYNC(src, PROC_REF(jedi_spin), user)
/obj/item/dualsaber/proc/jedi_spin(mob/living/user)
@@ -109,18 +105,18 @@
/obj/item/dualsaber/proc/impale(mob/living/user)
to_chat(user, "You twirl around a bit before losing your balance and impaling yourself on [src].")
- if(wielded)
+ if(HAS_TRAIT(src, TRAIT_WIELDED))
user.take_bodypart_damage(20,25,check_armor = TRUE)
else
user.adjustStaminaLoss(25)
/obj/item/dualsaber/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
- if(wielded)
+ if(HAS_TRAIT(src, TRAIT_WIELDED))
return ..()
return 0
/obj/item/dualsaber/process()
- if(wielded)
+ if(HAS_TRAIT(src, TRAIT_WIELDED))
if(hacked)
set_light_color(pick(COLOR_SOFT_RED, LIGHT_COLOR_GREEN, LIGHT_COLOR_LIGHT_CYAN, LIGHT_COLOR_LAVENDER))
open_flame()
@@ -128,12 +124,12 @@
STOP_PROCESSING(SSobj, src)
/obj/item/dualsaber/IsReflect()
- if(wielded)
+ if(HAS_TRAIT(src, TRAIT_WIELDED))
return 1
/obj/item/dualsaber/ignition_effect(atom/A, mob/user)
// same as /obj/item/melee/transforming/energy, mostly
- if(!wielded)
+ if(!HAS_TRAIT(src, TRAIT_WIELDED))
return ""
var/in_mouth = ""
if(iscarbon(user))
diff --git a/code/game/objects/items/melee/energyhalberd.dm b/code/game/objects/items/melee/energyhalberd.dm
index 62c6f5de6020..8ae5cdd96f36 100644
--- a/code/game/objects/items/melee/energyhalberd.dm
+++ b/code/game/objects/items/melee/energyhalberd.dm
@@ -31,13 +31,12 @@
var/two_hand_force = 34
var/hacked = FALSE
var/list/possible_colors = list("red", "blue", "green", "purple", "yellow")
- var/wielded = FALSE // track wielded status on item
/obj/item/energyhalberd/ComponentInitialize()
. = ..()
AddComponent(/datum/component/two_handed, force_unwielded=force, force_wielded=two_hand_force, wieldsound='sound/weapons/saberon.ogg', unwieldsound='sound/weapons/saberoff.ogg')
-/// Triggered on wield of two handed item
+
/// Specific hulk checks due to reflection chance for balance issues and switches hitsounds.
/obj/item/energyhalberd/proc/on_halberdwield(obj/item/source, mob/living/carbon/user)
SIGNAL_HANDLER
@@ -46,7 +45,6 @@
if(user.dna.check_mutation(HULK))
to_chat(user, "You lack the grace to wield this!")
return COMPONENT_TWOHANDED_BLOCK_WIELD
- wielded = TRUE
sharpness = IS_SHARP
w_class = w_class_on
hitsound = 'sound/weapons/blade1.ogg'
@@ -54,12 +52,9 @@
set_light_on(TRUE)
-/// Triggered on unwield of two handed item
/// switch hitsounds
/obj/item/energyhalberd/proc/on_halberdunwield(obj/item/source, mob/living/carbon/user)
SIGNAL_HANDLER
-
- wielded = FALSE
sharpness = initial(sharpness)
w_class = initial(w_class)
hitsound = "swing_hit"
@@ -68,7 +63,7 @@
/obj/item/energyhalberd/update_icon_state()
- if(wielded)
+ if(HAS_TRAIT(src, TRAIT_WIELDED))
icon_state = "halberd[halberd_color]"
return ..()
else
@@ -101,28 +96,28 @@
if(user.has_dna())
if(user.dna.check_mutation(HULK))
to_chat(user, "You grip the blade too hard and accidentally drop it!")
- if(wielded)
+ if(HAS_TRAIT(src, TRAIT_WIELDED))
user.dropItemToGround(src, force=TRUE)
return
..()
- if(wielded && HAS_TRAIT(user, TRAIT_CLUMSY) && prob(40))
+ if(HAS_TRAIT(src, TRAIT_WIELDED) && HAS_TRAIT(user, TRAIT_CLUMSY) && prob(40))
impale(user)
return
/obj/item/energyhalberd/proc/impale(mob/living/user)
to_chat(user, "You swing around a bit before losing your balance and impaling yourself on [src].")
- if(wielded)
+ if(HAS_TRAIT(src, TRAIT_WIELDED))
user.take_bodypart_damage(20,25,check_armor = TRUE)
else
user.adjustStaminaLoss(25)
/obj/item/energyhalberd/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
- if(wielded)
+ if(HAS_TRAIT(src, TRAIT_WIELDED))
return ..()
return 0
/obj/item/energyhalberd/process()
- if(wielded)
+ if(HAS_TRAIT(src, TRAIT_WIELDED))
if(hacked)
set_light_color(pick(COLOR_SOFT_RED, LIGHT_COLOR_GREEN, LIGHT_COLOR_LIGHT_CYAN, LIGHT_COLOR_LAVENDER))
open_flame()
@@ -130,12 +125,12 @@
STOP_PROCESSING(SSobj, src)
/obj/item/energyhalberd/IsReflect()
- if(wielded)
+ if(HAS_TRAIT(src, TRAIT_WIELDED))
return 1
/obj/item/energyhalberd/ignition_effect(atom/A, mob/user)
// same as /obj/item/melee/transforming/energy, mostly
- if(!wielded)
+ if(!HAS_TRAIT(src, TRAIT_WIELDED))
return ""
var/in_mouth = ""
if(iscarbon(user))
diff --git a/code/game/objects/items/melee/fireaxe.dm b/code/game/objects/items/melee/fireaxe.dm
index bfbed0fe361b..b3e04ac1bc3c 100644
--- a/code/game/objects/items/melee/fireaxe.dm
+++ b/code/game/objects/items/melee/fireaxe.dm
@@ -13,31 +13,13 @@
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 30)
resistance_flags = FIRE_PROOF
species_exception = list(/datum/species/kepori)
- var/wielded = FALSE // track wielded status on item
-
-/obj/item/melee/axe/Initialize()
- . = ..()
- RegisterSignal(src, COMSIG_TWOHANDED_WIELD, PROC_REF(on_wield))
- RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, PROC_REF(on_unwield))
/obj/item/melee/axe/ComponentInitialize()
. = ..()
AddComponent(/datum/component/butchering, 100, 80, 0 , hitsound) //axes are not known for being precision butchering tools
AddComponent(/datum/component/two_handed, force_unwielded=5, force_wielded=24, icon_wielded="[base_icon_state]1")
-/// triggered on wield of two handed item
-/obj/item/melee/axe/proc/on_wield(obj/item/source, mob/user)
- SIGNAL_HANDLER
-
- wielded = TRUE
-
-/// triggered on unwield of two handed item
-/obj/item/melee/axe/proc/on_unwield(obj/item/source, mob/user)
- SIGNAL_HANDLER
-
- wielded = FALSE
-
-/obj/item/melee/axe/update_icon_state()
+/obj/item/fireaxe/update_icon_state()
icon_state = "[base_icon_state]0"
return ..()
@@ -45,7 +27,7 @@
. = ..()
if(!proximity)
return
- if(wielded) //destroys windows and grilles in one hit
+ if(HAS_TRAIT(src, TRAIT_WIELDED)) //destroys windows and grilles in one hit
if(istype(A, /obj/structure/window) || istype(A, /obj/structure/grille))
var/obj/structure/W = A
W.obj_destruction("axe")
diff --git a/code/game/objects/items/melee/spear.dm b/code/game/objects/items/melee/spear.dm
index 42717117fd8e..218638882bfb 100644
--- a/code/game/objects/items/melee/spear.dm
+++ b/code/game/objects/items/melee/spear.dm
@@ -66,30 +66,15 @@
icon_prefix = "spearbomb"
var/obj/item/grenade/explosive = null
var/war_cry = "AAAAARGH!!!"
- var/wielded = FALSE // track wielded status on item
/obj/item/melee/spear/explosive/Initialize(mapload)
. = ..()
- RegisterSignal(src, COMSIG_TWOHANDED_WIELD, PROC_REF(on_wield))
- RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, PROC_REF(on_unwield))
set_explosive(new /obj/item/grenade/iedcasing/spawned()) //For admin-spawned explosive lances
/obj/item/melee/spear/explosive/ComponentInitialize()
. = ..()
AddComponent(/datum/component/two_handed, force_unwielded=10, force_wielded=18, icon_wielded="[icon_prefix]1")
-/// triggered on wield of two handed item
-/obj/item/melee/spear/explosive/proc/on_wield(obj/item/source, mob/user)
- SIGNAL_HANDLER
-
- wielded = TRUE
-
-/// triggered on unwield of two handed item
-/obj/item/melee/spear/explosive/proc/on_unwield(obj/item/source, mob/user)
- SIGNAL_HANDLER
-
- wielded = FALSE
-
/obj/item/melee/spear/explosive/proc/set_explosive(obj/item/grenade/G)
if(explosive)
QDEL_NULL(explosive)
@@ -130,7 +115,7 @@
. = ..()
if(!proximity)
return
- if(wielded)
+ if(HAS_TRAIT(src, TRAIT_WIELDED))
user.say("[war_cry]", forced="spear warcry")
explosive.forceMove(AM)
explosive.prime()
diff --git a/code/game/objects/items/melee/sword.dm b/code/game/objects/items/melee/sword.dm
index 21bde05c0dd3..ff384770a318 100644
--- a/code/game/objects/items/melee/sword.dm
+++ b/code/game/objects/items/melee/sword.dm
@@ -332,38 +332,20 @@
attack_verb = list("cut", "sliced", "diced")
slot_flags = ITEM_SLOT_BACK
hitsound = 'sound/weapons/bladeslice.ogg'
- var/wielded = FALSE // track wielded status on item
-
-/obj/item/melee/sword/vibro/Initialize()
- . = ..()
- RegisterSignal(src, COMSIG_TWOHANDED_WIELD, PROC_REF(on_wield))
- RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, PROC_REF(on_unwield))
/obj/item/melee/sword/vibro/ComponentInitialize()
. = ..()
AddComponent(/datum/component/butchering, 20, 105)
AddComponent(/datum/component/two_handed, force_multiplier=2, icon_wielded="[base_icon_state]1")
-/// triggered on wield of two handed item
-/obj/item/melee/sword/vibro/proc/on_wield(obj/item/source, mob/user)
- SIGNAL_HANDLER
-
- wielded = TRUE
-
-/// triggered on unwield of two handed item
-/obj/item/melee/sword/vibro/proc/on_unwield(obj/item/source, mob/user)
- SIGNAL_HANDLER
-
- wielded = FALSE
-
/obj/item/melee/sword/vibro/update_icon_state()
icon_state = "[base_icon_state]0"
return ..()
/obj/item/melee/sword/vibro/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
- if(wielded)
+ if(HAS_TRAIT(src, TRAIT_WIELDED))
final_block_chance *= 2
- if(wielded || attack_type != PROJECTILE_ATTACK)
+ if(HAS_TRAIT(src, TRAIT_WIELDED) || attack_type != PROJECTILE_ATTACK)
if(prob(final_block_chance))
if(attack_type == PROJECTILE_ATTACK)
owner.visible_message("[owner] deflects [attack_text] with [src]!")
diff --git a/code/game/objects/items/miscellaneous.dm b/code/game/objects/items/miscellaneous.dm
index f32230a732ba..3c8f3ead8709 100644
--- a/code/game/objects/items/miscellaneous.dm
+++ b/code/game/objects/items/miscellaneous.dm
@@ -116,7 +116,6 @@
/obj/item/storage/box/hero/ghostbuster/PopulateContents()
new /obj/item/choice_beacon/ouija(src)
- new /obj/item/clothing/glasses/welding/ghostbuster(src)
new /obj/item/storage/belt/fannypack/bustin(src)
new /obj/item/clothing/gloves/color/black(src)
new /obj/item/clothing/shoes/jackboots(src)
diff --git a/code/game/objects/items/plushes.dm b/code/game/objects/items/plushes.dm
index 63e4ffc5e6c3..4b16ee60942d 100644
--- a/code/game/objects/items/plushes.dm
+++ b/code/game/objects/items/plushes.dm
@@ -38,7 +38,7 @@
. = ..()
if(should_squeak)
AddComponent(/datum/component/squeak, squeak_override)
- AddElement(/datum/element/bed_tuckable, 6, -5, 90)
+ AddElement(/datum/element/bed_tuckable, 6, -5, 90, FALSE, FALSE)
//have we decided if Pinocchio goes in the blue or pink aisle yet?
if(gender == NEUTER)
diff --git a/code/game/objects/items/pneumaticCannon.dm b/code/game/objects/items/pneumaticCannon.dm
index 5108a8713633..9122be0a5d6c 100644
--- a/code/game/objects/items/pneumaticCannon.dm
+++ b/code/game/objects/items/pneumaticCannon.dm
@@ -326,23 +326,3 @@
/obj/item/pneumatic_cannon/speargun/Initialize()
. = ..()
allowed_typecache = magspear_typecache
-
-/obj/item/storage/backpack/magspear_quiver
- name = "quiver"
- desc = "A quiver for holding magspears."
- icon_state = "quiver"
- item_state = "quiver"
-
-/obj/item/storage/backpack/magspear_quiver/ComponentInitialize()
- . = ..()
- var/datum/component/storage/STR = GetComponent(/datum/component/storage)
- STR.max_items = 20
- STR.max_combined_w_class = 40
- STR.display_numerical_stacking = TRUE
- STR.set_holdable(list(
- /obj/item/throwing_star/magspear
- ))
-
-/obj/item/storage/backpack/magspear_quiver/PopulateContents()
- for(var/i in 1 to 20)
- new /obj/item/throwing_star/magspear(src)
diff --git a/code/game/objects/items/religion.dm b/code/game/objects/items/religion.dm
index f54aa4f6447b..97cc74a51589 100644
--- a/code/game/objects/items/religion.dm
+++ b/code/game/objects/items/religion.dm
@@ -244,40 +244,6 @@
/obj/item/clothing/gloves/plate/blue
icon_state = "crusader-blue"
-/obj/item/clothing/shoes/plate
- name = "Plate Boots"
- desc = "Metal boots, they look heavy."
- icon_state = "crusader"
- w_class = WEIGHT_CLASS_NORMAL
- armor = list("melee" = 50, "bullet" = 50, "laser" = 50, "energy" = 50, "bomb" = 60, "bio" = 0, "rad" = 0, "fire" = 60, "acid" = 60) //does this even do anything on boots?
- clothing_flags = NOSLIP
- cold_protection = FEET
- min_cold_protection_temperature = SHOES_MIN_TEMP_PROTECT
- heat_protection = FEET
- max_heat_protection_temperature = SHOES_MAX_TEMP_PROTECT
-
-
-/obj/item/clothing/shoes/plate/red
- icon_state = "crusader-red"
-
-/obj/item/clothing/shoes/plate/blue
- icon_state = "crusader-blue"
-
-
/obj/item/storage/box/itemset/crusader
name = "Crusader's Armour Set" //i can't into ck2 references
desc = "This armour is said to be based on the armor of kings on another world thousands of years ago, who tended to assassinate, conspire, and plot against everyone who tried to do the same to them. Some things never change."
-
-
-/obj/item/storage/box/itemset/crusader/blue/PopulateContents()
- new /obj/item/clothing/suit/armor/plate/crusader/blue(src)
- new /obj/item/clothing/head/helmet/plate/crusader/blue(src)
- new /obj/item/clothing/gloves/plate/blue(src)
- new /obj/item/clothing/shoes/plate/blue(src)
-
-
-/obj/item/storage/box/itemset/crusader/red/PopulateContents()
- new /obj/item/clothing/suit/armor/plate/crusader/red(src)
- new /obj/item/clothing/head/helmet/plate/crusader/red(src)
- new /obj/item/clothing/gloves/plate/red(src)
- new /obj/item/clothing/shoes/plate/red(src)
diff --git a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm
index 243b84b7e1ec..614b37ec4548 100644
--- a/code/game/objects/items/robot/robot_items.dm
+++ b/code/game/objects/items/robot/robot_items.dm
@@ -886,7 +886,7 @@
desc = "A special apparatus for carrying drinks without spilling the contents. Alt-Z or right-click to drop the beaker."
icon_state = "borg_beaker_apparatus"
storable = list(/obj/item/reagent_containers/food/drinks/,
- /obj/item/reagent_containers/food/condiment)
+ /obj/item/reagent_containers/condiment)
/obj/item/borg/apparatus/beaker/service/Initialize()
. = ..()
diff --git a/code/game/objects/items/stacks/sheets/leather.dm b/code/game/objects/items/stacks/sheets/leather.dm
index 26cff752c364..75c863bee5b6 100644
--- a/code/game/objects/items/stacks/sheets/leather.dm
+++ b/code/game/objects/items/stacks/sheets/leather.dm
@@ -57,14 +57,6 @@ GLOBAL_LIST_INIT(gondola_recipes, list ( \
. = ..()
. += GLOB.gondola_recipes
-GLOBAL_LIST_INIT(corgi_recipes, list ( \
- new/datum/stack_recipe("corgi costume", /obj/item/clothing/suit/hooded/ian_costume, 3), \
- ))
-
-/obj/item/stack/sheet/animalhide/corgi/get_main_recipes()
- . = ..()
- . += GLOB.corgi_recipes
-
/obj/item/stack/sheet/animalhide/cat
name = "cat hide"
desc = "The by-product of cat farming."
@@ -81,7 +73,6 @@ GLOBAL_LIST_INIT(corgi_recipes, list ( \
GLOBAL_LIST_INIT(monkey_recipes, list ( \
new/datum/stack_recipe("monkey mask", /obj/item/clothing/mask/gas/monkeymask, 1), \
- new/datum/stack_recipe("monkey suit", /obj/item/clothing/suit/monkeysuit, 2), \
))
/obj/item/stack/sheet/animalhide/monkey/get_main_recipes()
@@ -102,15 +93,6 @@ GLOBAL_LIST_INIT(monkey_recipes, list ( \
icon_state = "sheet-xeno"
item_state = "sheet-xeno"
-GLOBAL_LIST_INIT(xeno_recipes, list ( \
- new/datum/stack_recipe("alien helmet", /obj/item/clothing/head/xenos, 1), \
- new/datum/stack_recipe("alien suit", /obj/item/clothing/suit/xenos, 2), \
- ))
-
-/obj/item/stack/sheet/animalhide/xeno/get_main_recipes()
- . = ..()
- . += GLOB.xeno_recipes
-
//don't see anywhere else to put these, maybe together they could be used to make the xenos suit?
/obj/item/stack/sheet/xenochitin
name = "alien chitin"
@@ -167,7 +149,6 @@ GLOBAL_LIST_INIT(leather_recipes, list ( \
new/datum/stack_recipe("bandolier", /obj/item/storage/belt/bandolier, 5), \
new/datum/stack_recipe("leather jacket", /obj/item/clothing/suit/jacket/leather, 7), \
new/datum/stack_recipe("leather shoes", /obj/item/clothing/shoes/laceup, 2), \
- new/datum/stack_recipe("leather overcoat", /obj/item/clothing/suit/jacket/leather/overcoat, 10), \
new/datum/stack_recipe("saddle", /obj/item/saddle, 5), \
))
diff --git a/code/game/objects/items/stacks/sheets/recipes/recipes_metal.dm b/code/game/objects/items/stacks/sheets/recipes/recipes_metal.dm
index 6860f34be5c7..9819a941e5f8 100644
--- a/code/game/objects/items/stacks/sheets/recipes/recipes_metal.dm
+++ b/code/game/objects/items/stacks/sheets/recipes/recipes_metal.dm
@@ -1,9 +1,13 @@
GLOBAL_LIST_INIT(metal_recipes, list ( \
new/datum/stack_recipe("stool", /obj/structure/chair/stool, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("bar stool", /obj/structure/chair/stool/bar, one_per_turf = TRUE, on_floor = TRUE), \
- new/datum/stack_recipe("bed", /obj/structure/bed, 2, one_per_turf = TRUE, on_floor = TRUE), \
- new/datum/stack_recipe("double bed", /obj/structure/bed/double, 4, one_per_turf = TRUE, on_floor = TRUE), \
null, \
+ new/datum/stack_recipe_list("beds", list( \
+ new/datum/stack_recipe("bed", /obj/structure/bed, 2, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("double bed", /obj/structure/bed/double, 4, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("bottom bunk", /obj/structure/bed/bunk, 2, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("top bunk", /obj/structure/bed/bunk/top, 2, one_per_turf = TRUE, on_floor = TRUE), \
+ )), \
new/datum/stack_recipe_list("office chairs", list( \
new/datum/stack_recipe("gray office chair", /obj/structure/chair/office, 5, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("light office chair", /obj/structure/chair/office/light, 5, one_per_turf = TRUE, on_floor = TRUE), \
diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm
index 786462121e77..ce64af1fd205 100644
--- a/code/game/objects/items/stacks/sheets/sheet_types.dm
+++ b/code/game/objects/items/stacks/sheets/sheet_types.dm
@@ -450,8 +450,6 @@ GLOBAL_LIST_INIT(bronze_recipes, list ( \
new/datum/stack_recipe("pinion airlock assembly", /obj/structure/door_assembly/door_assembly_bronze, 4, time = 50, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("bronze pinion airlock assembly", /obj/structure/door_assembly/door_assembly_bronze/seethru, 4, time = 50, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("bronze hat", /obj/item/clothing/head/bronze), \
- new/datum/stack_recipe("bronze suit", /obj/item/clothing/suit/bronze), \
- new/datum/stack_recipe("bronze boots", /obj/item/clothing/shoes/bronze), \
null,
new/datum/stack_recipe("bronze chair", /obj/structure/chair/comfy/shuttle/bronze, 1, time = 0, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("Marx Bust", /obj/structure/statue/bronze/marx, 15, one_per_turf = 1, on_floor = 1), \
diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm
index 5653b641c99d..f34836de156f 100644
--- a/code/game/objects/items/stacks/stack.dm
+++ b/code/game/objects/items/stacks/stack.dm
@@ -305,7 +305,7 @@
if(!window_structure.fulltile)
continue
if(object.density)
- to_chat(usr, "There is \a [object.name] here. You cant make \a [recipe.title] here!")
+ to_chat(usr, "There is \a [object.name] here. You can't make \a [recipe.title] here!")
return FALSE
if(recipe.placement_checks)
switch(recipe.placement_checks)
diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm
index 0076de0b8155..dd0598e80c2d 100644
--- a/code/game/objects/items/storage/backpack.dm
+++ b/code/game/objects/items/storage/backpack.dm
@@ -16,6 +16,8 @@
desc = "You wear this on your back and put items into it."
icon_state = "backpack"
item_state = "backpack"
+ icon = 'icons/obj/clothing/back/backpacks.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/back/backpacks.dmi'
lefthand_file = 'icons/mob/inhands/equipment/backpack_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/backpack_righthand.dmi'
pickup_sound = "rustle"
@@ -26,7 +28,9 @@
max_integrity = 300
greyscale_icon_state = "backpack"
greyscale_colors = list(list(13, 17), list(12, 17), list(12, 21))
- supports_variations = VOX_VARIATION
+
+ supports_variations = VOX_VARIATION | KEPORI_VARIATION
+ kepori_override_icon = 'icons/mob/clothing/back/backpacks_kepori.dmi'
/obj/item/storage/backpack/ComponentInitialize()
. = ..()
@@ -61,51 +65,12 @@
STR.storage_flags = STORAGE_FLAGS_VOLUME_DEFAULT
STR.max_volume = STORAGE_VOLUME_BAG_OF_HOLDING
-/obj/item/storage/backpack/santabag
- name = "Santa's Gift Bag"
- desc = "Space Santa uses this to deliver presents to all the nice children in space in Christmas! Wow, it's pretty big!"
- icon_state = "giftbag0"
- item_state = "giftbag"
- w_class = WEIGHT_CLASS_BULKY
-
-/obj/item/storage/backpack/santabag/Initialize()
- . = ..()
- regenerate_presents()
-
-/obj/item/storage/backpack/santabag/ComponentInitialize()
- . = ..()
- var/datum/component/storage/STR = GetComponent(/datum/component/storage)
- STR.max_w_class = WEIGHT_CLASS_NORMAL
- STR.max_combined_w_class = 60
-
-/obj/item/storage/backpack/santabag/proc/regenerate_presents()
- addtimer(CALLBACK(src, PROC_REF(regenerate_presents)), 30 SECONDS)
-
- var/mob/M = get(loc, /mob)
- if(!istype(M))
- return
- if(M.mind && HAS_TRAIT(M.mind, TRAIT_CANNOT_OPEN_PRESENTS))
- var/datum/component/storage/STR = GetComponent(/datum/component/storage)
- var/turf/floor = get_turf(src)
- var/obj/item/I = new /obj/item/a_gift/anything(floor)
- if(STR.can_be_inserted(I, stop_messages=TRUE))
- STR.handle_item_insertion(I, prevent_warning=TRUE)
- else
- qdel(I)
-
-
/obj/item/storage/backpack/cultpack
name = "trophy rack"
desc = "It's useful for both carrying extra gear and proudly declaring your insanity."
icon_state = "cultpack"
item_state = "backpack"
-/obj/item/storage/backpack/clown
- name = "Giggles von Honkerton"
- desc = "It's a backpack made by Honk! Co."
- icon_state = "clownpack"
- item_state = "clownpack"
-
/obj/item/storage/backpack/explorer
name = "explorer bag"
desc = "A robust backpack for stashing your loot."
@@ -215,7 +180,6 @@
item_state = "satchel-norm"
greyscale_icon_state = "satchel"
greyscale_colors = list(list(11, 12), list(17, 18), list(10, 11))
- supports_variations = VOX_VARIATION
/obj/item/storage/backpack/satchel/ComponentInitialize()
. = ..()
@@ -226,7 +190,6 @@
/obj/item/storage/backpack/satchel/leather
name = "leather satchel"
desc = "It's a very fancy satchel made with fine leather."
- icon = 'icons/obj/storage.dmi'
icon_state = "satchel"
item_state = "satchel"
@@ -261,12 +224,6 @@
icon_state = "satchel-chem"
item_state = "satchel-chem"
-/obj/item/storage/backpack/satchel/gen
- name = "geneticist satchel"
- desc = "A sterile satchel with geneticist colours."
- icon_state = "satchel-gen"
- item_state = "satchel-gen"
-
/obj/item/storage/backpack/satchel/tox
name = "scientist satchel"
desc = "Useful for holding research materials."
@@ -354,8 +311,6 @@
/obj/item/storage/backpack/messenger
name = "messenger bag"
desc = "A sturdy backpack worn over one shoulder."
- icon = 'icons/obj/storage.dmi'
- mob_overlay_icon = 'icons/mob/clothing/back.dmi'
icon_state = "courierbag"
item_state = "courierbag"
greyscale_icon_state = "satchel"
@@ -689,7 +644,6 @@
/obj/item/storage/backpack/duffelbag/clown/syndie/PopulateContents()
new /obj/item/pda/clown(src)
new /obj/item/clothing/under/rank/civilian/clown(src)
- new /obj/item/clothing/shoes/clown_shoes(src)
new /obj/item/clothing/mask/gas/clown_hat(src)
new /obj/item/bikehorn(src)
new /obj/item/implanter/sad_trombone(src)
diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm
index 415d7340d67e..7e326e0f2316 100644
--- a/code/game/objects/items/storage/belt.dm
+++ b/code/game/objects/items/storage/belt.dm
@@ -275,6 +275,7 @@
STR.set_holdable(list(
/obj/item/melee/baton,
/obj/item/melee/classic_baton,
+ /obj/item/melee/knife,
/obj/item/grenade,
/obj/item/reagent_containers/spray/pepper,
/obj/item/restraints/handcuffs,
@@ -367,7 +368,7 @@
/obj/item/storage/fancy/cigarettes,
/obj/item/reagent_containers/food/drinks/bottle,
/obj/item/stack/medical,
- /obj/item/melee/knife/kitchen,
+ /obj/item/melee/knife,
/obj/item/reagent_containers/hypospray,
/obj/item/gps,
/obj/item/storage/bag/ore,
diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm
index 8aa7b1d9c478..57b574e39b7f 100644
--- a/code/game/objects/items/storage/boxes.dm
+++ b/code/game/objects/items/storage/boxes.dm
@@ -455,7 +455,7 @@
/obj/item/storage/box/condimentbottles/PopulateContents()
for(var/i in 1 to 6)
- new /obj/item/reagent_containers/food/condiment(src)
+ new /obj/item/reagent_containers/condiment(src)
/obj/item/storage/box/cups
name = "box of paper cups"
diff --git a/code/game/objects/items/storage/guncases.dm b/code/game/objects/items/storage/guncases.dm
index 8fe256f2b6c2..2feb49af03f7 100644
--- a/code/game/objects/items/storage/guncases.dm
+++ b/code/game/objects/items/storage/guncases.dm
@@ -1,8 +1,8 @@
/obj/item/storage/guncase
name = "gun case"
desc = "A large box designed for holding firearms and magazines safely."
- icon = 'icons/obj/guncase_48x32.dmi'
- icon_state = "riflecase"
+ icon = 'icons/obj/guncase.dmi'
+ icon_state = "guncase"
item_state = "infiltrator_case"
force = 12
throwforce = 12
@@ -14,7 +14,6 @@
drop_sound = 'sound/items/handling/toolbox_drop.ogg'
pickup_sound = 'sound/items/handling/toolbox_pickup.ogg'
-
/obj/item/storage/guncase/ComponentInitialize()
. = ..()
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
@@ -38,7 +37,6 @@
/obj/item/storage/guncase/absolution/PopulateContents()
new /obj/item/gun/ballistic/shotgun/flamingarrow/absolution/no_mag(src)
-
/obj/item/storage/guncase/skm
/obj/item/storage/guncase/skm/PopulateContents()
new /obj/item/gun/ballistic/automatic/assault/skm/no_mag(src)
@@ -101,7 +99,7 @@
name = "pistol case"
desc = "A large box designed for holding pistols and magazines safely."
icon = 'icons/obj/guncase.dmi'
- icon_state = "pistolcase"
+ icon_state = "guncase"
item_state = "infiltrator_case"
force = 12
throwforce = 12
diff --git a/code/game/objects/items/storage/ration.dm b/code/game/objects/items/storage/ration.dm
index 169e0dfad0a6..9a9e4a5a2617 100644
--- a/code/game/objects/items/storage/ration.dm
+++ b/code/game/objects/items/storage/ration.dm
@@ -28,7 +28,9 @@
. = ..()
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
STR.max_items = 7
- STR.set_holdable(list(/obj/item/reagent_containers/food))
+ STR.set_holdable(list(
+ /obj/item/reagent_containers/food,
+ /obj/item/ration_heater))
STR.locked = TRUE
STR.locked_flavor = "sealed closed"
diff --git a/code/game/objects/items/storage/secure.dm b/code/game/objects/items/storage/secure.dm
index 422ff52b15b0..f918a3b883fb 100644
--- a/code/game/objects/items/storage/secure.dm
+++ b/code/game/objects/items/storage/secure.dm
@@ -173,7 +173,7 @@
. = ..()
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
STR.set_holdable(null, list(/obj/item/storage/secure/briefcase))
- STR.max_w_class = 8 //??
+ STR.max_w_class = 8
/obj/item/storage/secure/safe/PopulateContents()
new /obj/item/paper(src)
diff --git a/code/game/objects/items/storage/toolbox.dm b/code/game/objects/items/storage/toolbox.dm
index f2d0becadb54..e0768391dae5 100644
--- a/code/game/objects/items/storage/toolbox.dm
+++ b/code/game/objects/items/storage/toolbox.dm
@@ -177,7 +177,7 @@
new /obj/item/crowbar/syndie(src) //WS Begin - Cool Syndie Tools
new /obj/item/wirecutters/syndie(src)
new /obj/item/multitool/syndie(src) //WS End
- new /obj/item/clothing/gloves/color/red/insulated(src)
+ new /obj/item/clothing/gloves/color/yellow(src)
/obj/item/storage/toolbox/syndicate/empty
@@ -298,7 +298,6 @@
/obj/item/clothing/under/syndicate/bloodred,
/obj/item/clothing/gloves/color/latex/nitrile/infiltrator,
/obj/item/clothing/mask/infiltrator,
- /obj/item/clothing/shoes/combat/sneakboots,
/obj/item/gun/ballistic/automatic/pistol/ringneck,
/obj/item/gun/ballistic/revolver,
/obj/item/ammo_box
@@ -310,7 +309,6 @@
new /obj/item/clothing/under/syndicate/bloodred(src)
new /obj/item/clothing/gloves/color/latex/nitrile/infiltrator(src)
new /obj/item/clothing/mask/infiltrator(src)
- new /obj/item/clothing/shoes/combat/sneakboots(src)
/obj/item/storage/toolbox/bounty
name = "defused explosives case"
diff --git a/code/game/objects/items/storage/uplink_kits.dm b/code/game/objects/items/storage/uplink_kits.dm
index ca2de8d1e7c0..9516c7128090 100644
--- a/code/game/objects/items/storage/uplink_kits.dm
+++ b/code/game/objects/items/storage/uplink_kits.dm
@@ -146,7 +146,6 @@
if("white_whale_holy_grail") //Unique items that don't appear anywhere else
new /obj/item/pneumatic_cannon/speargun(src)
- new /obj/item/storage/backpack/magspear_quiver(src)
new /obj/item/clothing/suit/space/hardsuit/carp(src)
new /obj/item/clothing/mask/gas/carp(src)
new /obj/item/grenade/spawnergrenade/spesscarp(src)
diff --git a/code/game/objects/items/tanks/watertank.dm b/code/game/objects/items/tanks/watertank.dm
index 50f709dcd65f..23fe0852c353 100644
--- a/code/game/objects/items/tanks/watertank.dm
+++ b/code/game/objects/items/tanks/watertank.dm
@@ -175,6 +175,39 @@
amount_per_transfer_from_this = (amount_per_transfer_from_this == 10 ? 5 : 10)
to_chat(user, "You [amount_per_transfer_from_this == 10 ? "remove" : "fix"] the nozzle. You'll now use [amount_per_transfer_from_this] units per spray.")
+//radiation cleanup pack
+
+/obj/item/watertank/anti_rad
+ name = "radiation foam pack"
+ desc = "A pressurized backpack tank with sprayer nozzle, intended to clean up radioactive hazards."
+ item_state = "waterbackpackatmos"
+ icon_state = "waterbackpackatmos"
+ volume = 200
+ slowdown = 0.3
+
+/obj/item/watertank/anti_rad/Initialize()
+ . = ..()
+ reagents.add_reagent(/datum/reagent/anti_radiation_foam, 200)
+
+
+/obj/item/reagent_containers/spray/mister/anti_rad
+ name = "spray nozzle"
+ desc = "A heavy duty nozzle attached to a radiation foam tank."
+ icon_state = "atmos_nozzle"
+ item_state = "nozzleatmos"
+ amount_per_transfer_from_this = 5
+ possible_transfer_amounts = list()
+ current_range = 6
+ spray_range = 6
+
+
+/obj/item/watertank/anti_rad/make_noz()
+ return new /obj/item/reagent_containers/spray/mister/anti_rad(src)
+
+/obj/item/reagent_containers/spray/mister/anti_rad/attack_self(mob/user)
+ amount_per_transfer_from_this = (amount_per_transfer_from_this == 10 ? 5 : 10)
+ to_chat(user, "You [amount_per_transfer_from_this == 10 ? "tigten" : "loosen"] the nozzle. You'll now use [amount_per_transfer_from_this] units per spray.")
+
//ATMOS FIRE FIGHTING BACKPACK
#define EXTINGUISHER 0
diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
index 062ab37f86ae..6d6d258b5b0c 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -1260,7 +1260,6 @@
/obj/item/toy/figure/curator
name = "Curator action figure"
icon_state = "curator"
- toysay = "One day while..."
/obj/item/toy/figure/md
name = "Medical Doctor action figure"
diff --git a/code/game/objects/structures/beds_chairs/alien_nest.dm b/code/game/objects/structures/beds_chairs/alien_nest.dm
index 4f132b11af99..ecc050aa8f77 100644
--- a/code/game/objects/structures/beds_chairs/alien_nest.dm
+++ b/code/game/objects/structures/beds_chairs/alien_nest.dm
@@ -14,6 +14,7 @@
buildstacktype = null
flags_1 = NODECONSTRUCT_1
bolts = FALSE
+ swap_lying_with_dir = FALSE
var/static/mutable_appearance/nest_overlay = mutable_appearance('icons/mob/alien.dmi', "nestoverlay", LYING_MOB_LAYER)
/obj/structure/bed/nest/user_unbuckle_mob(mob/living/buckled_mob, mob/living/user)
diff --git a/code/game/objects/structures/beds_chairs/bed.dm b/code/game/objects/structures/beds_chairs/bed.dm
index 6c5f46e94a3b..533f58bdf2ac 100644
--- a/code/game/objects/structures/beds_chairs/bed.dm
+++ b/code/game/objects/structures/beds_chairs/bed.dm
@@ -18,10 +18,44 @@
resistance_flags = FLAMMABLE
max_integrity = 100
integrity_failure = 0.35
+
var/buildstacktype = /obj/item/stack/sheet/metal
var/buildstackamount = 2
var/bolts = TRUE
+ /// Whether the bed changes its buckle_lying direction
+ /// (and accordingly the direction in which mobs lie down) based on its current direction.
+ var/swap_lying_with_dir = TRUE
+ /// If non-null, some items (bedsheets) which can be tucked into beds
+ /// will set their layer to this value when they are tucked in, until they are picked up again.
+ var/suggested_tuck_layer = null
+ /// The amount added to the pixel_x value of a tucked-in item.
+ var/tucked_x_shift = 0
+ /// The amount added to the pixel_y value of a tucked-in item.
+ var/tucked_y_shift = 0
+
+/obj/structure/bed/Initialize(...)
+ . = ..()
+ if(swap_lying_with_dir)
+ buckle_lying = get_buckle_angle_from_dir(dir)
+
+/obj/structure/bed/setDir(newdir)
+ . = ..()
+ if(swap_lying_with_dir)
+ buckle_lying = get_buckle_angle_from_dir(newdir)
+ // shuttle rotation etc... ugh.
+ if(has_buckled_mobs())
+ for(var/mob/living/M as anything in buckled_mobs)
+ // this proc already checks to see if the new angle is different from the old one,
+ // so this shouldn't cause any duplicate work or unnecessary animations.
+ M.set_lying_angle(buckle_lying)
+
+/obj/structure/bed/proc/get_buckle_angle_from_dir(some_dir)
+ if(some_dir & (SOUTH|WEST))
+ return 90
+ else
+ return 270
+
/obj/structure/bed/examine(mob/user)
. = ..()
if(bolts)
@@ -37,7 +71,7 @@
return attack_hand(user)
/obj/structure/bed/attackby(obj/item/W, mob/user, params)
- if(W.tool_behaviour == TOOL_WRENCH && !(flags_1&NODECONSTRUCT_1))
+ if((W.tool_behaviour == TOOL_WRENCH || W.tool_behaviour == TOOL_DECONSTRUCT) && !(flags_1&NODECONSTRUCT_1))
W.play_tool_sound(src)
deconstruct(TRUE)
else
@@ -52,6 +86,9 @@
icon_state = "down"
anchored = FALSE
resistance_flags = NONE
+
+ // no dir states
+ swap_lying_with_dir = FALSE
var/foldabletype = /obj/item/roller
/obj/structure/bed/roller/attackby(obj/item/W, mob/user, params)
@@ -161,8 +198,9 @@
else
to_chat(user, "The dock is empty!")
-//Dog bed
-
+/*
+ * "Dog" beds
+ */
/obj/structure/bed/dogbed
name = "dog bed"
icon_state = "dogbed"
@@ -170,6 +208,9 @@
anchored = TRUE
buildstacktype = /obj/item/stack/sheet/mineral/wood
buildstackamount = 10
+
+ // no dir states
+ swap_lying_with_dir = FALSE
var/mob/living/owner = null
/obj/structure/bed/dogbed/ian
@@ -206,7 +247,9 @@
. = ..()
update_owner(M)
-//Double Beds, for luxurious sleeping, i.e. the captain and maybe heads - no quirky refrence here. Move along
+/*
+ * Double beds, for luxurious sleeping, i.e. the captain and maybe heads - no quirky refrence here. Move along
+ */
/obj/structure/bed/double
name = "double bed"
desc = "A luxurious double bed, for those too important for small dreams."
@@ -232,3 +275,84 @@
name = "double dirty mattress"
desc = "An old grubby king sized mattress. You really try to not think about what could be the cause of those stains."
icon_state = "dirty_mattress_double"
+
+/*
+ * Bunk beds. Comes with an /obj/effect spawner that lets mappers place them down easily.
+ * The base type is the bottom bunk, with the top bunk as a derived type.
+ * Like other beds, the pillow may be on the left or right depending on the direction.
+ */
+/obj/structure/bed/bunk
+ name = "bottom bunk"
+ desc = "The oft-maligned bottom bunk of a compact bunk bed. Heavy sleepers only."
+ icon_state = "bottom_bunk"
+ // just below the top bunk's main layer
+ suggested_tuck_layer = LYING_MOB_LAYER + 0.005
+ /// The amount added to the pixel_y value of mobs lying down, relative to the default shift for that position.
+ var/mob_y_shift = -1
+ // i think it looks best without shifting the bedsheet down, even though the mob gets shifted down some
+
+// alter their pixel offset when they lie down...
+/obj/structure/bed/bunk/post_buckle_mob(mob/living/M)
+ // we shift the lying mob a little so that they line up better with the pillow, but the shift direction changes
+ // depending on the direction they lie down in, controlled by buckle_lying
+ // (which is in turn based on our direction, but we don't need to worry about that directly)
+ var/horz_offset
+ if(buckle_lying == 90)
+ horz_offset = 2
+ else
+ horz_offset = -2
+
+ M.pixel_x = M.get_standard_pixel_x_offset(M.body_position == LYING_DOWN) + horz_offset
+ M.pixel_y = M.get_standard_pixel_y_offset(M.body_position == LYING_DOWN) + mob_y_shift
+
+// ...and reset it when they get off
+/obj/structure/bed/bunk/post_unbuckle_mob(mob/living/M)
+ M.pixel_x = M.get_standard_pixel_x_offset(M.body_position == LYING_DOWN)
+ M.pixel_y = M.get_standard_pixel_y_offset(M.body_position == LYING_DOWN)
+
+
+/obj/structure/bed/bunk/top
+ name = "top bunk"
+ desc = "The top bunk of a compact bunk bed. Few other sleeping accommodations can match its luxury."
+ icon_state = "top_bunk"
+
+ // higher layer, so that it renders on top of people on the bottom bunk
+ layer = LYING_MOB_LAYER + 0.01
+ mob_y_shift = 13
+
+ // above the lying mob, but below the ladder
+ suggested_tuck_layer = LYING_MOB_LAYER + 0.025
+ tucked_y_shift = 14
+
+/obj/structure/bed/bunk/top/Initialize(...)
+ . = ..()
+ // the ladder needs to render above the mob
+ overlays += image(icon = 'icons/obj/objects.dmi', icon_state = "top_bunk_ladder", layer = LYING_MOB_LAYER + 0.03)
+ // and the posts need to render below the bottom bunk
+ overlays += image(icon = 'icons/obj/objects.dmi', icon_state = "top_bunk_posts", layer = TABLE_LAYER)
+
+/obj/structure/bed/bunk/top/post_buckle_mob(mob/living/M)
+ . = ..()
+ M.layer = LYING_MOB_LAYER + 0.02
+
+/obj/structure/bed/bunk/top/post_unbuckle_mob(mob/living/M)
+ . = ..()
+ // honestly not really confident in this, but since standing up takes a do_after
+ // (and thus happens afterwards, resetting the layer), it should be fine...
+ // i'm more worried about altering layers via + and -, since if you figured out ways
+ // of stacking those you could layer yourself under, like, the floor.
+ M.layer = LYING_MOB_LAYER
+
+
+// the spawner
+/obj/effect/spawner/bunk_bed
+ name = "bunk bed spawner"
+ icon_state = "bunk_bed_spawner"
+
+/obj/effect/spawner/bunk_bed/Initialize(...)
+ . = ..()
+ var/obj/structure/bed/bunk/bottom_bunk = new(loc)
+ var/obj/structure/bed/bunk/top/top_bunk = new(loc)
+
+ bottom_bunk.setDir(dir)
+ top_bunk.setDir(dir)
diff --git a/code/game/objects/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm
index 045bf39ae9b6..40e0d9388515 100644
--- a/code/game/objects/structures/beds_chairs/chair.dm
+++ b/code/game/objects/structures/beds_chairs/chair.dm
@@ -60,7 +60,7 @@
qdel(src)
/obj/structure/chair/attackby(obj/item/W, mob/user, params)
- if(W.tool_behaviour == TOOL_WRENCH && !(flags_1&NODECONSTRUCT_1))
+ if((W.tool_behaviour == TOOL_WRENCH || W.tool_behaviour == TOOL_DECONSTRUCT) && !(flags_1&NODECONSTRUCT_1))
W.play_tool_sound(src)
deconstruct()
else if(istype(W, /obj/item/assembly/shock_kit))
diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm
index 6b574db58cf5..8ee8d8214f80 100644
--- a/code/game/objects/structures/bedsheet_bin.dm
+++ b/code/game/objects/structures/bedsheet_bin.dm
@@ -28,7 +28,7 @@ LINEN BINS
/obj/item/bedsheet/Initialize(mapload)
. = ..()
- AddElement(/datum/element/bed_tuckable, 0, 0, 0)
+ AddElement(/datum/element/bed_tuckable, 0, 0, 0, TRUE, TRUE)
/obj/item/bedsheet/attack_self(mob/user)
if(!user.CanReach(src)) //No telekenetic grabbing.
diff --git a/code/game/objects/structures/cabinet.dm b/code/game/objects/structures/cabinet.dm
new file mode 100644
index 000000000000..bc89cf1d0bbe
--- /dev/null
+++ b/code/game/objects/structures/cabinet.dm
@@ -0,0 +1,214 @@
+/obj/structure/cabinet
+ name = "\improper cabinet"
+ desc = "There is a small label that reads \"For Emergency use only\". Yeah right."
+ icon = 'icons/obj/wallmounts.dmi'
+ icon_state = "fireaxe"
+ anchored = TRUE
+ density = FALSE
+ armor = list("melee" = 50, "bullet" = 20, "laser" = 0, "energy" = 100, "bomb" = 10, "bio" = 100, "rad" = 100, "fire" = 90, "acid" = 50)
+ max_integrity = 150
+ integrity_failure = 0.33
+ req_one_access_txt = "0"
+ var/locked = TRUE
+ var/open = FALSE
+ var/start_empty = FALSE
+ var/obj/item/stored
+ var/allowed_type
+ var/stored_sprite = "axe"
+
+/obj/structure/cabinet/Initialize()
+ . = ..()
+ if(allowed_type && !start_empty)
+ stored = new allowed_type(src)
+ update_appearance()
+
+/obj/structure/cabinet/Destroy()
+ if(istype(stored))
+ qdel(stored)
+ stored = null
+ return ..()
+
+/obj/structure/cabinet/examine(mob/user)
+ . = ..()
+ if(!open)
+ . += span_notice("Alt-click to [locked ? "unlock" : "lock"] [src]")
+ if(stored)
+ . += span_notice("[stored] is sitting inside, ripe for the taking.")
+
+/obj/structure/cabinet/attackby(obj/item/I, mob/user, params)
+ if(iscyborg(user) || I.tool_behaviour == TOOL_MULTITOOL)
+ hack_lock(user)
+ else if(I.tool_behaviour == TOOL_WELDER && user.a_intent == INTENT_HELP && !broken)
+ if(obj_integrity < max_integrity)
+ if(!I.tool_start_check(user, amount=2))
+ return
+ to_chat(user, span_notice("You begin repairing [src]"))
+ if(I.use_tool(src, user, 40, volume=50, amount=2))
+ obj_integrity = max_integrity
+ update_appearance()
+ to_chat(user, span_notice("You repair [src]"))
+ else
+ to_chat(user, span_warning("[src] is already in good condition!"))
+ return
+ else if(istype(I, /obj/item/stack/sheet/glass) && broken)
+ var/obj/item/stack/sheet/glass/G = I
+ if(G.get_amount() < 2)
+ to_chat(user, span_warning("You need two [G.singular_name] to fix [src]!"))
+ return
+ to_chat(user, span_notice("You start fixing [src]..."))
+ if(do_after(user, 20, target = src) && G.use(2))
+ broken = 0
+ obj_integrity = max_integrity
+ update_appearance()
+ else if(open || broken)
+ if(istype(I, allowed_type) && !stored)
+ var/obj/item/storee = I
+ SIGNAL_HANDLER
+ if(storee && HAS_TRAIT(storee, TRAIT_WIELDED))
+ to_chat(user, span_warning("Unwield the [storee.name] first."))
+ return
+ if(!user.transferItemToLoc(I, src))
+ return
+ stored = storee
+ to_chat(user, span_notice("You place the [storee.name] back in the [name]."))
+ update_appearance()
+ return
+ else if(!broken)
+ toggle_open()
+ else
+ return ..()
+
+/obj/structure/cabinet/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
+ switch(damage_type)
+ if(BRUTE)
+ if(broken)
+ playsound(loc, 'sound/effects/hit_on_shattered_glass.ogg', 90, TRUE)
+ else
+ playsound(loc, 'sound/effects/glasshit.ogg', 90, TRUE)
+ if(BURN)
+ playsound(src.loc, 'sound/items/welder.ogg', 100, TRUE)
+
+/obj/structure/cabinet/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir)
+ if(open)
+ return
+ . = ..()
+ if(.)
+ update_appearance()
+
+/obj/structure/cabinet/obj_break(damage_flag)
+ if(!broken && !(flags_1 & NODECONSTRUCT_1))
+ update_appearance()
+ broken = TRUE
+ playsound(src, 'sound/effects/glassbr3.ogg', 100, TRUE)
+ new /obj/item/shard(loc)
+ new /obj/item/shard(loc)
+
+/obj/structure/cabinet/deconstruct(disassembled = TRUE)
+ if(!(flags_1 & NODECONSTRUCT_1))
+ if(stored && loc)
+ stored.forceMove(loc)
+ stored = null
+ new /obj/item/stack/sheet/metal(loc, 2)
+ qdel(src)
+
+/obj/structure/cabinet/attack_hand(mob/user)
+ . = ..()
+ if(.)
+ return
+ if(open || broken)
+ if(stored)
+ to_chat(user, span_notice("You take [stored] from [name]."))
+ user.put_in_hands(stored)
+ stored = null
+ src.add_fingerprint(user)
+ update_appearance()
+ return
+ if(locked)
+ to_chat(user, span_warning("[name] won't budge!"))
+ return
+ else
+ open = !open
+ update_appearance()
+ return
+
+/obj/structure/cabinet/attack_paw(mob/living/user)
+ return attack_hand(user)
+
+/obj/structure/cabinet/attack_ai(mob/user)
+ toggle_lock(user)
+ return
+
+/obj/structure/cabinet/attack_tk(mob/user)
+ if(locked)
+ to_chat(user, span_warning("[name] won't budge!"))
+ return
+ else
+ open = !open
+ update_appearance()
+ return
+
+/obj/structure/cabinet/update_overlays()
+ . = ..()
+ if(stored)
+ . += "[stored_sprite]"
+ if(open)
+ . += "glass_raised"
+ return
+ var/hp_percent = obj_integrity/max_integrity * 100
+ if(broken)
+ . += "glass4"
+ else
+ switch(hp_percent)
+ if(-INFINITY to 40)
+ . += "glass3"
+ if(40 to 60)
+ . += "glass2"
+ if(60 to 80)
+ . += "glass1"
+ if(80 to INFINITY)
+ . += "glass"
+
+ . += locked ? "locked" : "unlocked"
+
+/obj/structure/cabinet/proc/toggle_lock(mob/user)
+ if(!broken)
+ if(allowed(user))
+ if(iscarbon(user))
+ add_fingerprint(user)
+ locked = !locked
+ user.visible_message(
+ span_notice("[user] [locked ? "locks" : "unlocks"][src]."),
+ span_notice("You [locked ? "lock" : "unlock"] [src]."))
+ update_appearance()
+ else
+ to_chat(user, span_warning("Access denied!"))
+ else if(broken)
+ to_chat(user, span_warning("\The [src] is broken!"))
+
+/obj/structure/cabinet/AltClick(mob/user)
+ ..()
+ if(!user.canUseTopic(src, BE_CLOSE) || !isturf(loc) || open)
+ return
+ else
+ toggle_lock(user)
+
+/obj/structure/cabinet/proc/hack_lock(mob/user)
+ to_chat(user, span_notice("Resetting circuitry..."))
+ playsound(src, 'sound/machines/locktoggle.ogg', 50, TRUE)
+ if(do_after(user, 20, target = src))
+ to_chat(user, span_notice("You [locked ? "disable" : "re-enable"] the locking modules."))
+ locked = !locked
+ update_appearance()
+
+/obj/structure/cabinet/verb/toggle_open()
+ set name = "Open/Close"
+ set category = "Object"
+ set src in oview(1)
+
+ if(locked)
+ visible_message(span_warning("[name] won't budge!"))
+ return
+ else
+ open = !open
+ update_appearance()
+ return
diff --git a/code/game/objects/structures/cabinet_types.dm b/code/game/objects/structures/cabinet_types.dm
new file mode 100644
index 000000000000..347e1954ded4
--- /dev/null
+++ b/code/game/objects/structures/cabinet_types.dm
@@ -0,0 +1,10 @@
+/obj/structure/cabinet/fireaxe
+ name = "\improper fire axe cabinet"
+ desc = "There is a small label that reads \"For Emergency use only\" along with details for safe use of the axe. As if."
+ icon = 'icons/obj/wallmounts.dmi'
+ icon_state = "fireaxe"
+ anchored = TRUE
+ density = FALSE
+ stored_sprite = "axe"
+ allowed_type = /obj/item/melee/axe/fire
+ req_one_access_txt = "24"
diff --git a/code/game/objects/structures/catwalk.dm b/code/game/objects/structures/catwalk.dm
index 20986f9e6c27..2202e84d70e4 100644
--- a/code/game/objects/structures/catwalk.dm
+++ b/code/game/objects/structures/catwalk.dm
@@ -57,7 +57,7 @@
. += "The supporting rods look like they could be welded."
/obj/structure/catwalk/attackby(obj/item/C, mob/user, params)
- if(C.tool_behaviour == TOOL_WELDER && !(resistance_flags & INDESTRUCTIBLE))
+ if((C.tool_behaviour == TOOL_WELDER || C.tool_behaviour == TOOL_DECONSTRUCT) && !(resistance_flags & INDESTRUCTIBLE))
to_chat(user, "You slice off [src]")
deconstruct()
return
diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm
index 7731bf48d2ff..cd1c880eae74 100644
--- a/code/game/objects/structures/crates_lockers/closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets.dm
@@ -255,10 +255,24 @@
if(user in src)
return
if(src.tool_interact(W,user))
- return 1 // No afterattack
+ return TRUE // No afterattack
else
return ..()
+/obj/structure/closet/proc/try_deconstruct(obj/item/W, mob/user)
+ if(W.tool_behaviour == cutting_tool || W.tool_behaviour == TOOL_DECONSTRUCT)
+ if(!W.tool_start_check(user, amount = 0))
+ return
+ to_chat(user, span_notice("You begin cutting \the [src] apart..."))
+ if(W.use_tool(src, user, 40, volume = 50))
+ if(!opened)
+ return
+ user.visible_message(span_notice("[user] slices apart \the [src]."),
+ span_notice("You cut \the [src] apart with \the [W]."),
+ span_hear("You hear welding."))
+ deconstruct(TRUE)
+ return TRUE
+
/obj/structure/closet/proc/tool_interact(obj/item/W, mob/user)//returns TRUE if attackBy call shouldnt be continued (because tool was used/closet was of wrong type), FALSE if otherwise
. = TRUE
if(opened)
@@ -300,6 +314,13 @@
user.visible_message("[user] [anchored ? "anchored" : "unanchored"] \the [src] [anchored ? "to" : "from"] the ground.", \
"You [anchored ? "anchored" : "unanchored"] \the [src] [anchored ? "to" : "from"] the ground.", \
"You hear a ratchet.")
+
+ else if(W.tool_behaviour == TOOL_DECONSTRUCT && locked)
+ user.visible_message("[user] is cutting \the [src] open !", "You begin to cut \the [src] open.")
+ if (W.use_tool(src, user, 10 SECONDS, volume=0))
+ bust_open()
+ user.visible_message("[user] busted \the [src] open !", "You finish cutting \the [src] open.")
+
else if(user.a_intent != INTENT_HARM)
var/item_is_id = W.GetID()
if(!item_is_id)
diff --git a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm
index 7135b3d199a2..b0674a2d2b60 100644
--- a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm
+++ b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm
@@ -20,6 +20,13 @@
var/move_delay = FALSE
var/egged = 0
+/obj/structure/closet/cardboard/try_deconstruct(obj/item/W, mob/user)
+ if(W.tool_behaviour == cutting_tool)
+ user.visible_message(span_notice("[user] cut apart \the [src]."), \
+ span_notice("You cut \the [src] apart with \the [W]."))
+ deconstruct(TRUE)
+ return TRUE
+
/obj/structure/closet/cardboard/relaymove(mob/living/user, direction)
if(opened || move_delay || user.incapacitated() || !isturf(loc) || !has_gravity(loc))
return
diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm
index 39f65ca53a5b..6e7de98b21de 100644
--- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm
@@ -101,10 +101,6 @@
new /obj/item/clothing/accessory/pocketprotector/cosmetology(src)
new /obj/item/clothing/under/rank/civilian/chaplain(src)
new /obj/item/clothing/shoes/sneakers/black(src)
- new /obj/item/clothing/suit/chaplainsuit/nun(src)
- new /obj/item/clothing/head/nun_hood(src)
- new /obj/item/clothing/suit/hooded/chaplainsuit/monkhabit(src)
- new /obj/item/clothing/suit/chaplainsuit/holidaypriest(src)
new /obj/item/storage/backpack/cultpack(src)
new /obj/item/storage/fancy/candle_box(src)
new /obj/item/storage/fancy/candle_box(src)
@@ -249,8 +245,7 @@
/obj/item/clothing/under/rank/medical/geneticist = 2,
/obj/item/clothing/shoes/sneakers/white = 2,
/obj/item/clothing/suit/toggle/labcoat/genetics = 2,
- /obj/item/storage/backpack/genetics = 2,
- /obj/item/storage/backpack/satchel/gen = 2)
+ /obj/item/storage/backpack/genetics = 2)
generate_items_inside(items_inside,src)
return
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
index 0e7ab6e0a526..2bdc4f762dc0 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
@@ -33,9 +33,9 @@
/obj/structure/closet/secure_closet/freezer/kitchen/PopulateContents()
..()
for(var/i = 0, i < 3, i++)
- new /obj/item/reagent_containers/food/condiment/flour(src)
- new /obj/item/reagent_containers/food/condiment/rice(src)
- new /obj/item/reagent_containers/food/condiment/sugar(src)
+ new /obj/item/reagent_containers/condiment/flour(src)
+ new /obj/item/reagent_containers/condiment/rice(src)
+ new /obj/item/reagent_containers/condiment/sugar(src)
/obj/structure/closet/secure_closet/freezer/kitchen/maintenance
name = "maintenance refrigerator"
@@ -45,9 +45,9 @@
/obj/structure/closet/secure_closet/freezer/kitchen/maintenance/PopulateContents()
..()
for(var/i = 0, i < 5, i++)
- new /obj/item/reagent_containers/food/condiment/milk(src)
+ new /obj/item/reagent_containers/condiment/milk(src)
for(var/i = 0, i < 5, i++)
- new /obj/item/reagent_containers/food/condiment/soymilk(src)
+ new /obj/item/reagent_containers/condiment/soymilk(src)
for(var/i = 0, i < 2, i++)
new /obj/item/storage/fancy/egg_box(src)
@@ -82,9 +82,9 @@
/obj/structure/closet/secure_closet/freezer/fridge/PopulateContents()
..()
for(var/i = 0, i < 5, i++)
- new /obj/item/reagent_containers/food/condiment/milk(src)
+ new /obj/item/reagent_containers/condiment/milk(src)
for(var/i = 0, i < 5, i++)
- new /obj/item/reagent_containers/food/condiment/soymilk(src)
+ new /obj/item/reagent_containers/condiment/soymilk(src)
for(var/i = 0, i < 2, i++)
new /obj/item/storage/fancy/egg_box(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
index 8ccc632dbac5..23aa2df0ab5a 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
@@ -25,12 +25,10 @@
new /obj/item/clothing/head/caphat(src)
new /obj/item/clothing/head/caphat/parade(src)
new /obj/item/clothing/suit/armor/vest/capcarapace/captunic(src)
- new /obj/item/clothing/head/crown/fancy(src)
new /obj/item/cartridge/captain(src)
new /obj/item/storage/box/silver_ids(src)
new /obj/item/radio/headset/heads/captain/alt(src)
new /obj/item/radio/headset/heads/captain(src)
- new /obj/item/clothing/glasses/sunglasses/gar/supergar(src)
new /obj/item/clothing/gloves/color/captain(src)
new /obj/item/storage/belt/sabre(src)
new /obj/item/gun/energy/e_gun(src)
@@ -50,7 +48,6 @@
new /obj/item/clothing/head/beret/hop(src) //WS edit - More Berets
new /obj/item/clothing/under/rank/command/head_of_personnel(src) //WS Edit - Better Command Uniforms
new /obj/item/clothing/under/rank/command/head_of_personnel/skirt(src) //WS Edit - Better Command Uniforms
- new /obj/item/clothing/head/hopcap(src)
new /obj/item/cartridge/head_of_personnel(src)
new /obj/item/radio/headset/heads/head_of_personnel(src)
new /obj/item/clothing/shoes/sneakers/brown(src)
@@ -92,7 +89,6 @@
new /obj/item/clothing/under/rank/security/head_of_security/alt/skirt(src)
new /obj/item/clothing/head/HoS(src)
new /obj/item/clothing/glasses/hud/security/sunglasses/eyepatch(src)
- new /obj/item/clothing/glasses/hud/security/sunglasses/gars/supergars(src)
new /obj/item/clothing/suit/armor/vest/security/hos(src) //WS Edit - Better security jumpsuit sprites
new /obj/item/storage/lockbox/medal/sec(src)
new /obj/item/megaphone/sec(src)
@@ -259,7 +255,6 @@
new /obj/item/paper/fluff/jobs/security/court_judgement (src)
new /obj/item/pen (src)
new /obj/item/clothing/suit/judgerobe (src)
- new /obj/item/clothing/head/powdered_wig (src)
new /obj/item/storage/briefcase(src)
/obj/structure/closet/secure_closet/contraband/armory
diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
index bca315340a4d..e3a8339dce46 100644
--- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
+++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
@@ -37,8 +37,6 @@
new /obj/item/clothing/under/color/jumpskirt/black(src)
if(prob(25))
new /obj/item/clothing/suit/jacket/leather(src)
- if(prob(20))
- new /obj/item/clothing/suit/jacket/leather/overcoat(src)
for(var/i in 1 to 3)
new /obj/item/clothing/shoes/sneakers/black(src)
for(var/i in 1 to 3)
diff --git a/code/game/objects/structures/crates_lockers/crates/graves.dm b/code/game/objects/structures/crates_lockers/crates/graves.dm
new file mode 100644
index 000000000000..dc7eee343d01
--- /dev/null
+++ b/code/game/objects/structures/crates_lockers/crates/graves.dm
@@ -0,0 +1,112 @@
+/obj/structure/closet/crate/grave
+ name = "burial mound"
+ desc = "A marked patch of soil, adorned with a wooden cross"
+ icon_state = "grave"
+ dense_when_open = TRUE
+ material_drop = /obj/item/stack/ore/glass/basalt
+ material_drop_amount = 5
+ opened = TRUE
+ anchorable = FALSE
+ anchored = TRUE
+ locked = TRUE
+ breakout_time = 900
+ cutting_tool = TOOL_SHOVEL
+
+/obj/structure/closet/crate/grave/attackby(obj/item/W, mob/user, params)
+ .=..()
+ if(istype(W, /obj/item/screwdriver))
+ if(!user.is_literate())
+ to_chat(user, "You scratch illegibly on [src]!")
+ return
+ var/t = stripped_input(user, "What would you like the inscription to be?", name, null, 53)
+ if(user.get_active_held_item() != W)
+ return
+ if(!user.canUseTopic(src, BE_CLOSE))
+ return
+ if(t)
+ desc = "[t]"
+ return
+
+/obj/structure/closet/crate/grave/open(mob/living/user, obj/item/S, force = FALSE)
+ if(!opened)
+ to_chat(user, "The ground here is too hard to dig up with your bare hands. You'll need a shovel.")
+ else
+ to_chat(user, "The grave has already been dug up.")
+
+/obj/structure/closet/crate/grave/tool_interact(obj/item/S, mob/living/carbon/user)
+ if(user.a_intent == INTENT_HELP) //checks to attempt to dig the grave, must be done on help intent only.
+ if(!opened)
+ if(S.tool_behaviour == cutting_tool)
+ to_chat(user, "You start start to dig open \the [src] with \the [S]...")
+ if (do_after(user,20, target = src))
+ opened = TRUE
+ locked = TRUE
+ dump_contents()
+ update_appearance()
+ SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "graverobbing", /datum/mood_event/graverobbing)
+ return TRUE
+ return TRUE
+ else
+ to_chat(user, "You can't dig up a grave with \the [S.name].")
+ return TRUE
+ else
+ to_chat(user, "The grave has already been dug up.")
+ return TRUE
+
+ else if((user.a_intent != INTENT_HELP) && opened) //checks to attempt to remove the grave entirely.
+ if(S.tool_behaviour == cutting_tool)
+ to_chat(user, "You start to remove \the [src] with \the [S].")
+ if (do_after(user,15, target = src))
+ to_chat(user, "You remove \the [src] completely.")
+ SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "graverobbing", /datum/mood_event/graverobbing)
+ deconstruct(TRUE)
+ return TRUE
+ return
+
+/obj/structure/closet/crate/grave/bust_open()
+ ..()
+ opened = TRUE
+ update_appearance()
+ dump_contents()
+ return
+
+/obj/structure/closet/crate/grave/stone
+ name = "burial mound"
+ desc = "A marked patch of soil, adorned with a sandstone slab"
+ icon_state = "grave_lead"
+
+/obj/structure/closet/crate/grave/loot
+ name = "burial mound"
+ desc = "A marked patch of soil, showing signs of a burial long ago. You wouldn't disturb a grave... right?"
+ opened = FALSE
+
+/obj/structure/closet/crate/grave/loot/PopulateContents() //GRAVEROBBING IS NOW A FEATURE
+ ..()
+ new /obj/effect/decal/remains/human/grave(src)
+ switch(rand(1,7))
+ if(1)
+ new /obj/item/spacecash/bundle/smallrand(src)
+ new /obj/item/card/id
+ new /obj/item/storage/wallet(src)
+ if(2)
+ new /obj/item/clothing/head/papersack/smiley(src)
+ if(3)
+ new /obj/item/clothing/under/nanotrasen(src)
+ new /obj/item/clothing/head/nanotrasen(src)
+ if(4)
+ new /obj/item/storage/book/bible/booze(src)
+ if(5)
+ new /obj/item/clothing/neck/stethoscope(src)
+ new /obj/item/scalpel(src)
+ new /obj/item/hemostat(src)
+
+ if(6)
+ new /obj/item/reagent_containers/glass/beaker/large/napalm(src)
+ new /obj/item/clothing/under/frontiersmen(src)
+ if(7)
+ new /obj/item/clothing/glasses/sunglasses(src)
+ new /obj/item/clothing/mask/cigarette/rollie(src)
+ new /obj/item/lighter(src)
+
+/obj/effect/decal/remains/human/grave
+ turf_loc_check = FALSE
diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm
index 4246075e49f6..43052f1f0dbb 100644
--- a/code/game/objects/structures/door_assembly.dm
+++ b/code/game/objects/structures/door_assembly.dm
@@ -333,6 +333,14 @@
new mineral_path(T, 2)
qdel(src)
+/obj/structure/door_assembly/deconstruct_act(mob/living/user, obj/item/I)
+ . = ..()
+ if(!I.tool_start_check(user, amount=0))
+ return FALSE
+ if (I.use_tool(src, user, 3 SECONDS, volume=100))
+ to_chat(user, "You slice [src] apart.")
+ deconstruct(FALSE)
+ return TRUE
/obj/structure/door_assembly/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd)
if(the_rcd.mode == RCD_DECONSTRUCT)
diff --git a/code/game/objects/structures/false_walls.dm b/code/game/objects/structures/false_walls.dm
index d5a8c3e496c1..48bf8817e1e7 100644
--- a/code/game/objects/structures/false_walls.dm
+++ b/code/game/objects/structures/false_walls.dm
@@ -107,9 +107,6 @@
else if(W.tool_behaviour == TOOL_WELDER)
if(W.use_tool(src, user, 0, volume=50))
dismantle(user, TRUE)
- else if(istype(W, /obj/item/pickaxe/drill/jackhammer))
- W.play_tool_sound(src)
- dismantle(user, TRUE)
else
return ..()
diff --git a/code/game/objects/structures/fireaxe.dm b/code/game/objects/structures/fireaxe.dm
deleted file mode 100644
index a164248a2bdd..000000000000
--- a/code/game/objects/structures/fireaxe.dm
+++ /dev/null
@@ -1,179 +0,0 @@
-/obj/structure/fireaxecabinet
- name = "fire axe cabinet"
- desc = "There is a small label that reads \"For Emergency use only\" along with details for safe use of the axe. As if."
- icon = 'icons/obj/wallmounts.dmi'
- icon_state = "fireaxe"
- anchored = TRUE
- density = FALSE
- armor = list("melee" = 50, "bullet" = 20, "laser" = 0, "energy" = 100, "bomb" = 10, "bio" = 100, "rad" = 100, "fire" = 90, "acid" = 50)
- max_integrity = 150
- integrity_failure = 0.33
- var/locked = TRUE
- var/open = FALSE
- var/obj/item/melee/axe/fire/fireaxe
-
-/obj/structure/fireaxecabinet/Initialize()
- . = ..()
- fireaxe = new
- update_appearance()
-
-/obj/structure/fireaxecabinet/Destroy()
- if(fireaxe)
- QDEL_NULL(fireaxe)
- return ..()
-
-/obj/structure/fireaxecabinet/attackby(obj/item/I, mob/user, params)
- if(iscyborg(user) || I.tool_behaviour == TOOL_MULTITOOL)
- toggle_lock(user)
- else if(I.tool_behaviour == TOOL_WELDER && user.a_intent == INTENT_HELP && !broken)
- if(obj_integrity < max_integrity)
- if(!I.tool_start_check(user, amount=2))
- return
-
- to_chat(user, "You begin repairing [src].")
- if(I.use_tool(src, user, 40, volume=50, amount=2))
- obj_integrity = max_integrity
- update_appearance()
- to_chat(user, "You repair [src].")
- else
- to_chat(user, "[src] is already in good condition!")
- return
- else if(istype(I, /obj/item/stack/sheet/glass) && broken)
- var/obj/item/stack/sheet/glass/G = I
- if(G.get_amount() < 2)
- to_chat(user, "You need two glass sheets to fix [src]!")
- return
- to_chat(user, "You start fixing [src]...")
- if(do_after(user, 20, target = src) && G.use(2))
- broken = 0
- obj_integrity = max_integrity
- update_appearance()
- else if(open || broken)
- if(istype(I, /obj/item/melee/axe/fire) && !fireaxe)
- var/obj/item/melee/axe/fire/F = I
- if(F && F.wielded)
- to_chat(user, "Unwield the [F.name] first.")
- return
- if(!user.transferItemToLoc(F, src))
- return
- fireaxe = F
- to_chat(user, "You place the [F.name] back in the [name].")
- update_appearance()
- return
- else if(!broken)
- toggle_open()
- else
- return ..()
-
-/obj/structure/fireaxecabinet/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
- switch(damage_type)
- if(BRUTE)
- if(broken)
- playsound(loc, 'sound/effects/hit_on_shattered_glass.ogg', 90, TRUE)
- else
- playsound(loc, 'sound/effects/glasshit.ogg', 90, TRUE)
- if(BURN)
- playsound(src.loc, 'sound/items/welder.ogg', 100, TRUE)
-
-/obj/structure/fireaxecabinet/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir)
- if(open)
- return
- . = ..()
- if(.)
- update_appearance()
-
-/obj/structure/fireaxecabinet/obj_break(damage_flag)
- if(!broken && !(flags_1 & NODECONSTRUCT_1))
- update_appearance()
- broken = TRUE
- playsound(src, 'sound/effects/glassbr3.ogg', 100, TRUE)
- new /obj/item/shard(loc)
- new /obj/item/shard(loc)
-
-/obj/structure/fireaxecabinet/deconstruct(disassembled = TRUE)
- if(!(flags_1 & NODECONSTRUCT_1))
- if(fireaxe && loc)
- fireaxe.forceMove(loc)
- fireaxe = null
- new /obj/item/stack/sheet/metal(loc, 2)
- qdel(src)
-
-/obj/structure/fireaxecabinet/attack_hand(mob/user)
- . = ..()
- if(.)
- return
- if(open || broken)
- if(fireaxe)
- user.put_in_hands(fireaxe)
- fireaxe = null
- to_chat(user, "You take the fire axe from the [name].")
- src.add_fingerprint(user)
- update_appearance()
- return
- if(locked)
- to_chat(user, "The [name] won't budge!")
- return
- else
- open = !open
- update_appearance()
- return
-
-/obj/structure/fireaxecabinet/attack_paw(mob/living/user)
- return attack_hand(user)
-
-/obj/structure/fireaxecabinet/attack_ai(mob/user)
- toggle_lock(user)
- return
-
-/obj/structure/fireaxecabinet/attack_tk(mob/user)
- if(locked)
- to_chat(user, "The [name] won't budge!")
- return
- else
- open = !open
- update_appearance()
- return
-
-/obj/structure/fireaxecabinet/update_overlays()
- . = ..()
- if(fireaxe)
- . += "axe"
- if(open)
- . += "glass_raised"
- return
- var/hp_percent = obj_integrity/max_integrity * 100
- if(broken)
- . += "glass4"
- else
- switch(hp_percent)
- if(-INFINITY to 40)
- . += "glass3"
- if(40 to 60)
- . += "glass2"
- if(60 to 80)
- . += "glass1"
- if(80 to INFINITY)
- . += "glass"
-
- . += locked ? "locked" : "unlocked"
-
-/obj/structure/fireaxecabinet/proc/toggle_lock(mob/user)
- to_chat(user, "Resetting circuitry...")
- playsound(src, 'sound/machines/locktoggle.ogg', 50, TRUE)
- if(do_after(user, 20, target = src))
- to_chat(user, "You [locked ? "disable" : "re-enable"] the locking modules.")
- locked = !locked
- update_appearance()
-
-/obj/structure/fireaxecabinet/verb/toggle_open()
- set name = "Open/Close"
- set category = "Object"
- set src in oview(1)
-
- if(locked)
- to_chat(usr, "The [name] won't budge!")
- return
- else
- open = !open
- update_appearance()
- return
diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm
index 53ced700eef2..5f35e69d098e 100644
--- a/code/game/objects/structures/girders.dm
+++ b/code/game/objects/structures/girders.dm
@@ -36,26 +36,7 @@
playsound(src, 'sound/machines/clockcult/integration_cog_install.ogg', 50, TRUE)
add_fingerprint(user)
- if(istype(W, /obj/item/gun/energy/plasmacutter))
- to_chat(user, "You start slicing apart the girder...")
- if(W.use_tool(src, user, 10, volume=100))
- to_chat(user, "You slice apart the girder.")
- var/obj/item/stack/sheet/metal/M = new (loc, 2)
- M.add_fingerprint(user)
- qdel(src)
-
- return
-
- else if(istype(W, /obj/item/pickaxe/drill/jackhammer))
- to_chat(user, "You smash through the girder!")
- new /obj/item/stack/sheet/metal(get_turf(src))
- W.play_tool_sound(src)
- qdel(src)
-
- return
-
-
- else if(istype(W, /obj/item/stack))
+ if(istype(W, /obj/item/stack))
if(iswallturf(loc))
to_chat(user, "There is already a wall present!")
return
@@ -231,6 +212,15 @@
else
return ..()
+/obj/structure/girder/deconstruct_act(mob/living/user, obj/item/I)
+ . = ..()
+ if(!I.tool_start_check(user, amount=0))
+ return FALSE
+ if(I.use_tool(src, user, 3 SECONDS, volume=0))
+ to_chat(user, "You cut apart \the [src].", "You cut apart \the [src].")
+ deconstruct()
+ return TRUE
+
// Screwdriver behavior for girders
/obj/structure/girder/screwdriver_act(mob/user, obj/item/tool)
if(..())
@@ -386,13 +376,6 @@
transfer_fingerprints_to(B)
qdel(src)
- else if(istype(W, /obj/item/pickaxe/drill/jackhammer))
- to_chat(user, "Your jackhammer smashes through the girder!")
- var/obj/item/stack/tile/bronze/B = new(drop_location(), 2)
- transfer_fingerprints_to(B)
- W.play_tool_sound(src)
- qdel(src)
-
else if(istype(W, /obj/item/stack/tile/bronze))
var/obj/item/stack/tile/bronze/B = W
if(B.get_amount() < 2)
diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm
index 5bca53e84dd6..b1897ee661d4 100644
--- a/code/game/objects/structures/grille.dm
+++ b/code/game/objects/structures/grille.dm
@@ -227,6 +227,15 @@
qdel(src)
..()
+/obj/structure/grille/deconstruct_act(mob/living/user, obj/item/I)
+ . = ..()
+ if(!I.tool_start_check(user, amount=0))
+ return FALSE
+ if (I.use_tool(src, user, 1 SECONDS, volume=100))
+ to_chat(user, "You slice [src] apart.")
+ deconstruct(FALSE)
+ return TRUE
+
/obj/structure/grille/obj_break()
if(!broken && !(flags_1 & NODECONSTRUCT_1))
new broken_type(src.loc)
diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm
index 30999b58a620..9aaefb8c014e 100644
--- a/code/game/objects/structures/lattice.dm
+++ b/code/game/objects/structures/lattice.dm
@@ -40,6 +40,15 @@
var/turf/T = get_turf(src)
return T.attackby(C, user) //hand this off to the turf instead (for building plating, catwalks, etc)
+/obj/structure/lattice/deconstruct_act(mob/living/user, obj/item/I)
+ . = ..()
+ if(!I.tool_start_check(user, amount=0))
+ return FALSE
+ if(I.use_tool(src, user, 1 SECONDS, volume=0))
+ to_chat(user, "You cut apart \the [src].", "You cut apart \the [src].")
+ deconstruct()
+ return TRUE
+
/obj/structure/lattice/deconstruct(disassembled = TRUE)
if(!(flags_1 & NODECONSTRUCT_1))
new build_material(get_turf(src), number_of_mats)
diff --git a/code/game/objects/structures/railings.dm b/code/game/objects/structures/railings.dm
index 95c24145399f..d8f5c543a168 100644
--- a/code/game/objects/structures/railings.dm
+++ b/code/game/objects/structures/railings.dm
@@ -65,6 +65,15 @@
deconstruct()
return TRUE
+/obj/structure/railing/deconstruct_act(mob/living/user, obj/item/I)
+ . = ..()
+ if(!I.tool_start_check(user, amount=0))
+ return FALSE
+ if (I.use_tool(src, user, 3 SECONDS, volume=0))
+ to_chat(user, "You cut apart the railing.")
+ deconstruct()
+ return TRUE
+
/obj/structure/railing/deconstruct(disassembled)
. = ..()
if(!loc) //quick check if it's qdeleted already.
diff --git a/code/game/objects/structures/safe.dm b/code/game/objects/structures/safe.dm
index 5f3e2914bc47..44a9f7f94717 100644
--- a/code/game/objects/structures/safe.dm
+++ b/code/game/objects/structures/safe.dm
@@ -75,6 +75,13 @@ FLOOR SAFES
if(istype(I, /obj/item/clothing/neck/stethoscope))
attack_hand(user)
return
+
+ else if(I.tool_behaviour == TOOL_DECONSTRUCT)
+ user.visible_message("[user] begin to cut through the lock of \the [src].","You start cutting trough the lock of [src].")
+ if(I.use_tool(src, user, 60 SECONDS))
+ broken = TRUE
+ user.visible_message("[user] successfully cuts trough the lock of \the [src].","You successfully cut trough the lock of [src].")
+
else
to_chat(user, "You can't put [I] into the safe while it is closed!")
return
diff --git a/code/game/objects/structures/salvaging.dm b/code/game/objects/structures/salvaging.dm
index dbd75dac488f..f4aad715db19 100644
--- a/code/game/objects/structures/salvaging.dm
+++ b/code/game/objects/structures/salvaging.dm
@@ -34,6 +34,16 @@
qdel(src)
return TRUE
+/obj/structure/salvageable/deconstruct_act(mob/living/user, obj/item/tool)
+ . = ..()
+ user.visible_message("[user] starts slicing [src].", \
+ "You start salvaging anything useful from [src]...")
+ if(tool.use_tool(src, user, 6 SECONDS))
+ user.visible_message("[user] dismantles [src].", \
+ "You salvage [src].")
+ dismantle(user)
+ qdel(src)
+ return TRUE
//Types themself, use them, but not the parent object
diff --git a/code/game/objects/structures/statues.dm b/code/game/objects/structures/statues.dm
index 9f51ba34476a..68c99d6649a5 100644
--- a/code/game/objects/structures/statues.dm
+++ b/code/game/objects/structures/statues.dm
@@ -299,3 +299,31 @@
name = "\improper Karl Marx bust"
desc = "A bust depicting a certain 19th century economist. You get the feeling a specter is haunting the sector."
icon_state = "marx"
+
+/// bone
+/obj/structure/statue/bone
+ anchored = TRUE
+ max_integrity = 120
+ material_drop_type = /obj/item/stack/sheet/bone
+ impressiveness = 18 // Carved from the bones of a massive creature, it's going to be a specticle to say the least
+ layer = ABOVE_ALL_MOB_LAYER
+
+/obj/structure/statue/bone/rib
+ name = "collosal rib"
+ desc = "It's staggering to think that something this big could have lived, let alone died."
+ oreAmount = 4
+ icon = 'icons/obj/statuelarge.dmi'
+ icon_state = "rib"
+
+/obj/structure/statue/bone/skull
+ name = "collosal skull"
+ desc = "The gaping maw of a dead, titanic monster."
+ oreAmount = 12
+ icon = 'icons/obj/statuelarge.dmi'
+ icon_state = "skull"
+
+/obj/structure/statue/bone/skull/half
+ desc = "The gaping maw of a dead, titanic monster. This one is cracked in half."
+ oreAmount = 6
+ icon = 'icons/obj/statuelarge.dmi'
+ icon_state = "skull-half"
diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm
index a7404ef68a6c..d5b1710b6296 100644
--- a/code/game/objects/structures/tables_racks.dm
+++ b/code/game/objects/structures/tables_racks.dm
@@ -162,7 +162,7 @@
/obj/structure/table/attackby(obj/item/I, mob/user, params)
var/list/modifiers = params2list(params)
if(!(flags_1 & NODECONSTRUCT_1) && user.a_intent != INTENT_HELP)
- if(I.tool_behaviour == TOOL_SCREWDRIVER && deconstruction_ready)
+ if((I.tool_behaviour == TOOL_SCREWDRIVER) && deconstruction_ready)
to_chat(user, "You start disassembling [src]...")
if(I.use_tool(src, user, 20, volume=50))
deconstruct(TRUE)
@@ -227,6 +227,15 @@
else
return ..()
+/obj/structure/table/deconstruct_act(mob/living/user, obj/item/I)
+ . = ..()
+ if(!I.tool_start_check(user, amount=0))
+ return FALSE
+ if (I.use_tool(src, user, 1 SECONDS, volume=0))
+ to_chat(user, span_warning("You cut [src] into sheets."))
+ deconstruct(wrench_disassembly = TRUE)
+ return TRUE
+
/obj/structure/table/proc/AfterPutItemOnTable(obj/item/I, mob/living/user)
return
diff --git a/code/game/objects/structures/tank_dispenser.dm b/code/game/objects/structures/tank_dispenser.dm
index 1be5f857e155..c0604dd5e09b 100644
--- a/code/game/objects/structures/tank_dispenser.dm
+++ b/code/game/objects/structures/tank_dispenser.dm
@@ -28,10 +28,10 @@
/obj/structure/tank_dispenser/update_overlays()
. = ..()
switch(oxygentanks)
- if(1 to 3)
+ if(1 to 4)
. += "oxygen-[oxygentanks]"
- if(4 to TANK_DISPENSER_CAPACITY)
- . += "oxygen-4"
+ if(5 to TANK_DISPENSER_CAPACITY)
+ . += "oxygen-5"
switch(plasmatanks)
if(1 to 4)
. += "plasma-[plasmatanks]"
diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm
index 0d97598a0504..6db5f18e31b9 100644
--- a/code/game/objects/structures/watercloset.dm
+++ b/code/game/objects/structures/watercloset.dm
@@ -397,6 +397,49 @@
icon_state = "puddle"
resistance_flags = UNACIDABLE
+//***Oil well puddles.
+/obj/structure/sink/oil_well
+ name = "oil well"
+ desc = "A bubbling pool of oil.This would probably be valuable, had bluespace technology not destroyed the need for fossil fuels 200 years ago."
+ icon = 'icons/obj/watercloset.dmi'
+ icon_state = "puddle-oil"
+ dispensedreagent = /datum/reagent/fuel/oil
+
+/obj/structure/sink/oil_well/Initialize()
+ .=..()
+ create_reagents(20)
+ reagents.add_reagent(dispensedreagent, 20)
+
+/obj/structure/sink/oil_well/attack_hand(mob/M)
+ flick("puddle-oil-splash",src)
+ reagents.expose(M, TOUCH, 20) //Covers target in 20u of oil.
+ to_chat(M, "You touch the pool of oil, only to get oil all over yourself. It would be wise to wash this off with water.")
+
+/obj/structure/sink/oil_well/attackby(obj/item/O, mob/user, params)
+ flick("puddle-oil-splash",src)
+ if(O.tool_behaviour == TOOL_SHOVEL && !(flags_1&NODECONSTRUCT_1)) //attempt to deconstruct the puddle with a shovel
+ to_chat(user, "You fill in the oil well with soil.")
+ O.play_tool_sound(src)
+ deconstruct()
+ return 1
+ if(istype(O, /obj/item/reagent_containers)) //Refilling bottles with oil
+ var/obj/item/reagent_containers/RG = O
+ if(RG.is_refillable())
+ if(!RG.reagents.holder_full())
+ RG.reagents.add_reagent(dispensedreagent, min(RG.volume - RG.reagents.total_volume, RG.amount_per_transfer_from_this))
+ to_chat(user, "You fill [RG] from [src].")
+ return TRUE
+ to_chat(user, "\The [RG] is full.")
+ return FALSE
+ if(user.a_intent != INTENT_HARM)
+ to_chat(user, "You won't have any luck getting \the [O] out if you drop it in the oil.")
+ return 1
+ else
+ return ..()
+
+/obj/structure/sink/oil_well/drop_materials()
+ new /obj/effect/decal/cleanable/oil(loc)
+
//ATTACK HAND IGNORING PARENT RETURN VALUE
/obj/structure/sink/puddle/attack_hand(mob/M)
icon_state = "puddle-splash"
diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm
index 5420cc06b490..5064883c5de9 100644
--- a/code/game/objects/structures/window.dm
+++ b/code/game/objects/structures/window.dm
@@ -27,6 +27,7 @@
var/real_explosion_block //ignore this, just use explosion_block
var/breaksound = "shatter"
var/hitsound = 'sound/effects/Glasshit.ogg'
+ var/decon_time = 5 SECONDS
flags_ricochet = RICOCHET_HARD
ricochet_chance_mod = 0.4
@@ -289,6 +290,15 @@
qdel(src)
update_nearby_icons()
+/obj/structure/window/deconstruct_act(mob/living/user, obj/item/I)
+ . = ..()
+ if(!I.tool_start_check(user, amount=0))
+ return FALSE
+ if (I.use_tool(src, user, decon_time, volume=100))
+ to_chat(user, span_warning("You shatter [src] with the [I]."))
+ deconstruct(FALSE)
+ return TRUE
+
/obj/structure/window/proc/spawnDebris(location)
. = list()
. += new /obj/item/shard(location)
@@ -399,6 +409,7 @@
glass_type = /obj/item/stack/sheet/rglass
rad_insulation = RAD_HEAVY_INSULATION
ricochet_chance_mod = 0.8
+ decon_time = 20 SECONDS
//this is shitcode but all of construction is shitcode and needs a refactor, it works for now
//If you find this like 4 years later and construction still hasn't been refactored, I'm so sorry for this
@@ -408,7 +419,7 @@
switch(state)
if(RWINDOW_SECURE)
- if(I.tool_behaviour == TOOL_WELDER && user.a_intent == INTENT_HARM)
+ if((I.tool_behaviour == TOOL_WELDER) && user.a_intent == INTENT_HARM)
user.visible_message("[user] holds \the [I] to the security screws on \the [src]...",
"You begin heating the security screws on \the [src]...")
if(I.use_tool(src, user, 150, volume = 100))
@@ -531,6 +542,7 @@
damage_deflection = 11 //WS Edit - Weakens R-Windows
explosion_block = 2
glass_type = /obj/item/stack/sheet/plasmarglass
+ decon_time = 25 SECONDS
//entirely copypasted code
//take this out when construction is made a component or otherwise modularized in some way
@@ -746,6 +758,7 @@
glass_type = /obj/item/stack/sheet/plastitaniumglass
glass_amount = 2
rad_insulation = RAD_HEAVY_INSULATION
+ decon_time = 30 SECONDS
/obj/structure/window/plasma/reinforced/plastitanium/unanchored
anchored = FALSE
diff --git a/code/game/turfs/closed/_closed.dm b/code/game/turfs/closed/_closed.dm
index 766d7e0e5a24..ea0c0d4ed4b1 100644
--- a/code/game/turfs/closed/_closed.dm
+++ b/code/game/turfs/closed/_closed.dm
@@ -269,6 +269,21 @@
return FALSE
+/turf/closed/deconstruct_act(mob/living/user, obj/item/I)
+ var/act_duration = breakdown_duration
+ if(!I.tool_start_check(user, amount=0))
+ return FALSE
+ to_chat(user, "You begin slicing through the outer plating...")
+ while(I.use_tool(src, user, act_duration, volume=100))
+ if(iswallturf(src))
+ to_chat(user, "You slice through some of the outer plating...")
+ if(!alter_integrity(-(I.wall_decon_damage),user,FALSE,TRUE))
+ return TRUE
+ else
+ break
+
+ return FALSE
+
/turf/closed/mech_melee_attack(obj/mecha/M)
M.do_attack_animation(src)
switch(M.damtype)
diff --git a/code/game/turfs/open/floor/plasteel_floor.dm b/code/game/turfs/open/floor/plasteel_floor.dm
index 61a90ff0da86..1feb9d0921e0 100644
--- a/code/game/turfs/open/floor/plasteel_floor.dm
+++ b/code/game/turfs/open/floor/plasteel_floor.dm
@@ -151,6 +151,13 @@
base_icon_state = "plaque"
tiled_dirt = FALSE
+/turf/open/floor/plasteel/lightgrey
+ name = "light grey floor"
+ icon_state = "corner_white_full"
+ base_icon_state = "corner_white_full"
+ icon = 'icons/turf/decals/decals.dmi'
+ color = "#a8b2b6"
+
/turf/open/floor/plasteel/cult/narsie_act()
return
diff --git a/code/game/turfs/open/floor/plating/wasteplanet.dm b/code/game/turfs/open/floor/plating/wasteplanet.dm
index 3cf9b047662c..7d839b66932d 100644
--- a/code/game/turfs/open/floor/plating/wasteplanet.dm
+++ b/code/game/turfs/open/floor/plating/wasteplanet.dm
@@ -58,6 +58,17 @@
initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS
planetary_atmos = TRUE
+/turf/open/floor/plasteel/wasteplanet
+ initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS
+
+/turf/open/floor/plasteel/wasteplanet/MakeSlippery(wet_setting, min_wet_time, wet_time_to_add, max_wet_time, permanent)
+ return
+
+/turf/open/floor/plasteel/dark/wasteplanet
+ initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS
+
+/turf/open/floor/plasteel/dark/wasteplanet/MakeSlippery(wet_setting, min_wet_time, wet_time_to_add, max_wet_time, permanent)
+ return
//cement
/turf/open/floor/concrete/wasteplanet
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index 32777a913d06..5123eed0be58 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -1196,9 +1196,9 @@
//milk to plasmemes and skeletons, meat to lizards, electricity bars to ethereals, cookies to everyone else
var/obj/item/reagent_containers/food/cookiealt = /obj/item/reagent_containers/food/snacks/cookie
if(isskeleton(H))
- cookiealt = /obj/item/reagent_containers/food/condiment/milk
+ cookiealt = /obj/item/reagent_containers/condiment/milk
else if(isplasmaman(H))
- cookiealt = /obj/item/reagent_containers/food/condiment/milk
+ cookiealt = /obj/item/reagent_containers/condiment/milk
else if(iselzuose(H))
cookiealt = /obj/item/reagent_containers/food/snacks/energybar
// WS - More fun with cookies - Start
diff --git a/code/modules/antagonists/abductor/equipment/abduction_gear.dm b/code/modules/antagonists/abductor/equipment/abduction_gear.dm
index 5bce8014babe..abc69300c9c6 100644
--- a/code/modules/antagonists/abductor/equipment/abduction_gear.dm
+++ b/code/modules/antagonists/abductor/equipment/abduction_gear.dm
@@ -761,6 +761,7 @@ Congratulations! You are now trained for invasive xenobiology research!"}
icon = 'icons/obj/abductor.dmi'
buildstacktype = /obj/item/stack/sheet/mineral/abductor
icon_state = "bed"
+ swap_lying_with_dir = FALSE
/obj/structure/table_frame/abductor
name = "alien table frame"
diff --git a/code/modules/antagonists/gang/gang.dm b/code/modules/antagonists/gang/gang.dm
index df962f83e814..a1b493b87b75 100644
--- a/code/modules/antagonists/gang/gang.dm
+++ b/code/modules/antagonists/gang/gang.dm
@@ -112,7 +112,6 @@
/obj/item/clothing/under/color/darkgreen,
/obj/item/clothing/neck/scarf/green,
/obj/item/clothing/head/beanie/green,
- /obj/item/clothing/suit/poncho/green,
/obj/item/clothing/mask/bandana/green)
free_clothes = list(/obj/item/clothing/mask/bandana/green,
/obj/item/clothing/under/color/darkgreen,
@@ -286,15 +285,11 @@
gang_id = "YAK"
acceptable_clothes = list(/obj/item/clothing/head/soft/yellow,
/obj/item/clothing/under/costume/yakuza,
- /obj/item/clothing/shoes/yakuza,
/obj/item/clothing/neck/scarf/yellow,
/obj/item/clothing/head/beanie/yellow,
/obj/item/clothing/mask/bandana/gold,
- /obj/item/clothing/head/hardhat,
- /obj/item/clothing/suit/yakuza)
+ /obj/item/clothing/head/hardhat)
free_clothes = list(/obj/item/clothing/under/costume/yakuza,
- /obj/item/clothing/shoes/yakuza,
- /obj/item/clothing/suit/yakuza,
/obj/item/clothing/head/hardhat,
/obj/item/toy/crayon/spraycan)
gang_objective = "The boss is thrilled about this new construction opportunity we've all been given, yadda yadda, look, he knows we're here to expand our business ventures for the clan, but Majima wanted it made VERY clear that we do NOT fuck this station's infrastructure up. If more than 15% of this station is busted when we get the hell out of here, it's your ass on the line."
@@ -310,12 +305,8 @@
gang_id = "JB"
acceptable_clothes = list(/obj/item/clothing/head/soft/blue,
/obj/item/clothing/under/costume/jackbros,
- /obj/item/clothing/shoes/jackbros,
- /obj/item/clothing/head/jackbros,
/obj/item/clothing/mask/bandana/blue)
free_clothes = list(/obj/item/clothing/under/costume/jackbros,
- /obj/item/clothing/shoes/jackbros,
- /obj/item/clothing/head/jackbros,
/obj/item/toy/crayon/spraycan)
gang_objective = "Hee-hello friends! We need to expand our influence, ho! Get a King Frost in as the Captain of this joint! Either get the original Captain on board with the program, or Hee-ho a fellow Jack Frost into the position yourselves!"
antag_hud_name = "JackFrost"
diff --git a/code/modules/antagonists/gang/outfits.dm b/code/modules/antagonists/gang/outfits.dm
index ae16ec956470..77c091d2126a 100644
--- a/code/modules/antagonists/gang/outfits.dm
+++ b/code/modules/antagonists/gang/outfits.dm
@@ -23,7 +23,6 @@
glasses = /obj/item/clothing/glasses/hud/spacecop
ears = /obj/item/radio/headset/headset_sec
mask = null
- head = /obj/item/clothing/head/spacepolice
belt = /obj/item/gun/ballistic/automatic/pistol/candor
r_pocket = /obj/item/lighter
l_pocket = /obj/item/restraints/handcuffs
diff --git a/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm b/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm
index 4677bca43956..af4b5bd60892 100644
--- a/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm
+++ b/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm
@@ -606,7 +606,7 @@ This is here to make the tiles around the station mininuke change when it's arme
/obj/item/disk/nuclear/Initialize()
. = ..()
- AddElement(/datum/element/bed_tuckable, 6, -6, 0)
+ AddElement(/datum/element/bed_tuckable, 6, -6, 0, FALSE, FALSE)
if(!fake)
SSpoints_of_interest.make_point_of_interest(src)
diff --git a/code/modules/antagonists/santa/santa.dm b/code/modules/antagonists/santa/santa.dm
index 996a53f316dc..2f1e874b2866 100644
--- a/code/modules/antagonists/santa/santa.dm
+++ b/code/modules/antagonists/santa/santa.dm
@@ -18,10 +18,6 @@
/datum/antagonist/santa/proc/give_equipment()
var/mob/living/carbon/human/H = owner.current
- if(istype(H))
- H.equipOutfit(/datum/outfit/santa)
- H.dna.update_dna_identity()
-
owner.AddSpell(new /obj/effect/proc_holder/spell/targeted/area_teleport/teleport/santa)
/datum/antagonist/santa/proc/give_objective()
diff --git a/code/modules/antagonists/wizard/equipment/artefact.dm b/code/modules/antagonists/wizard/equipment/artefact.dm
index ae651cf055e6..b50c6dc1ea8b 100644
--- a/code/modules/antagonists/wizard/equipment/artefact.dm
+++ b/code/modules/antagonists/wizard/equipment/artefact.dm
@@ -257,7 +257,6 @@
var/hat = pick(/obj/item/clothing/head/helmet/roman, /obj/item/clothing/head/helmet/roman/legionnaire)
H.equip_to_slot_or_del(new hat(H), ITEM_SLOT_HEAD)
H.equip_to_slot_or_del(new /obj/item/clothing/under/costume/roman(H), ITEM_SLOT_ICLOTHING)
- H.equip_to_slot_or_del(new /obj/item/clothing/shoes/roman(H), ITEM_SLOT_FEET)
H.put_in_hands(new /obj/item/shield/riot/roman(H), TRUE)
H.put_in_hands(new /obj/item/melee/sword/claymore(H), TRUE)
H.equip_to_slot_or_del(new /obj/item/melee/spear(H), ITEM_SLOT_BACK)
diff --git a/code/modules/antagonists/wizard/wizard.dm b/code/modules/antagonists/wizard/wizard.dm
index 96a41b2ac07b..27a3a343a907 100644
--- a/code/modules/antagonists/wizard/wizard.dm
+++ b/code/modules/antagonists/wizard/wizard.dm
@@ -172,7 +172,6 @@
antag_hud_name = "apprentice"
var/datum/mind/master
var/school = APPRENTICE_DESTRUCTION
- outfit_type = /datum/outfit/wizard/apprentice
wiz_age = APPRENTICE_AGE_MIN
/datum/antagonist/wizard/apprentice/greet()
@@ -252,7 +251,6 @@
/datum/antagonist/wizard/academy
name = "Academy Teacher"
- outfit_type = /datum/outfit/wizard/academy
move_to_lair = FALSE
/datum/antagonist/wizard/academy/equip_wizard()
diff --git a/code/modules/awaymissions/mission_code/Academy.dm b/code/modules/awaymissions/mission_code/Academy.dm
index 6f28cc724b55..850d0e91ba09 100644
--- a/code/modules/awaymissions/mission_code/Academy.dm
+++ b/code/modules/awaymissions/mission_code/Academy.dm
@@ -74,12 +74,6 @@
if(prob(1))
mezzer()
-
-/obj/item/clothing/glasses/meson/truesight
- name = "The Lens of Truesight"
- desc = "I can see forever!"
- icon_state = "monocle"
-
/obj/structure/academy_wizard_spawner
name = "Academy Defensive System"
desc = "Made by Abjuration, Inc."
@@ -152,14 +146,6 @@
icon_state = "forge_off"
STOP_PROCESSING(SSobj, src)
-/datum/outfit/wizard/academy
- name = "Academy Wizard"
- r_pocket = null
- r_hand = null
- suit = /obj/item/clothing/suit/wizrobe/red
- head = /obj/item/clothing/head/wizard/red
- backpack_contents = list(/obj/item/storage/box/survival = 1)
-
/obj/item/dice/d20/fate
name = "\improper Die of Fate"
desc = "A die with twenty sides. You can feel unearthly energies radiating from it. Using this might be VERY risky."
@@ -348,8 +334,6 @@
new /obj/item/clothing/suit/wizrobe(drop_location())
new /obj/item/clothing/head/wizard(drop_location())
new /obj/item/clothing/gloves/combat/wizard(drop_location())
- new /obj/item/clothing/suit/wizrobe/magusblue(drop_location())
- new /obj/item/clothing/head/wizard/magus(drop_location())
new /obj/item/staff(drop_location())
new /obj/structure/mirror/magic(drop_location())
@@ -357,8 +341,6 @@
name = "Butler"
uniform = /obj/item/clothing/under/suit/black_really
shoes = /obj/item/clothing/shoes/laceup
- head = /obj/item/clothing/head/bowler
- glasses = /obj/item/clothing/glasses/monocle
gloves = /obj/item/clothing/gloves/color/white
/obj/effect/proc_holder/spell/targeted/summonmob
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/clothing.dm b/code/modules/cargo/blackmarket/blackmarket_items/clothing.dm
index 7a9803085ab8..677b82624bae 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/clothing.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/clothing.dm
@@ -32,16 +32,6 @@
stock_max = 10
availability_prob = 80
-/datum/blackmarket_item/clothing/crown
- name = "Crown"
- desc = "A beautiful golden crown, rich with history and pedigree. Better worn than left to collect dust in a museum, right?"
- item = /obj/item/clothing/head/crown/fancy
-
- price_min = 1000
- price_max = 2000
- stock = 1
- availability_prob = 20
-
/datum/blackmarket_item/clothing/galaxy_blue
name = "Blue Galaxy Suit"
desc = "A handsome silk suit, treated with a finish of bluespace dust for an out of this world sheen."
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/explosives.dm b/code/modules/cargo/blackmarket/blackmarket_items/explosives.dm
index ab7f62830324..26402e3dfac0 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/explosives.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/explosives.dm
@@ -97,18 +97,6 @@
stock_max = 7
availability_prob = 50
-/datum/blackmarket_item/explosive/rpg
- name = "PML-9 RPG"
- desc = "Offically, it's an anti-armor RPG launcher. Technically, it's anti-everything. Most things don't enjoy being hit in the face with high explosives."
- item = /obj/item/gun/ballistic/rocketlauncher
-
- price_min = 3500
- price_max = 6500
- stock_min = 2
- stock_max = 5
- availability_prob = 10
- spawn_weighting = FALSE
-
/datum/blackmarket_item/explosive/live_bomb
name = "Active ICW Era Ordinance"
desc = "Look, I won't mince words. This thing is counting down and I don't want to be the next causualty of ICW after it's already ended. I'll sell it to you real cheap."
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm b/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
index cd0fcf9fd7a9..740ee2c5341b 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
@@ -350,4 +350,23 @@
stock_max = 2
availability_prob = 20
+/datum/blackmarket_item/weapon/fireaxe
+ name = "Fire Axe"
+ desc = "An incredibly sharp axe of dubious make used by various engineers throughout the years to settle arguments while hammered. Sold to us by a very friendly man in a suit."
+ item = /obj/item/melee/axe/fire
+ price_min = 2500
+ price_max = 3500
+ stock = 2
+ availability_prob = 40
+
+/datum/blackmarket_item/weapon/oneshot
+ name = "Hammer Launcher"
+ desc = "A one-shot solution to a myriad amount of problems, ranging from Exosuits to obnoxious neighbors. Contains one ready-to-fire 84mm HEDP rocket. "
+ item = /obj/item/gun/ballistic/rocketlauncher/oneshot
+
+ price_min = 3000
+ price_max = 4500
+ stock_min = 1
+ stock_max = 5
+ availability_prob = 25
diff --git a/code/modules/cargo/exports/lavaland.dm b/code/modules/cargo/exports/lavaland.dm
index bbb9aac228f3..7017b7d677df 100644
--- a/code/modules/cargo/exports/lavaland.dm
+++ b/code/modules/cargo/exports/lavaland.dm
@@ -18,7 +18,6 @@
/obj/item/dragons_blood,
/obj/item/lava_staff,
/obj/item/ship_in_a_bottle,
- /obj/item/clothing/shoes/clown_shoes/banana_shoes,
/obj/item/veilrender/vealrender,
/obj/item/clothing/suit/armor/ascetic)
diff --git a/code/modules/cargo/packs/costumes_toys.dm b/code/modules/cargo/packs/costumes_toys.dm
index fd3ba6c74863..cab2ac8563af 100644
--- a/code/modules/cargo/packs/costumes_toys.dm
+++ b/code/modules/cargo/packs/costumes_toys.dm
@@ -88,17 +88,10 @@
cost = 1000
contains = list(/obj/item/clothing/head/snowman,
/obj/item/clothing/suit/snowman,
- /obj/item/clothing/head/chicken,
- /obj/item/clothing/suit/chickensuit,
/obj/item/clothing/mask/gas/monkeymask,
- /obj/item/clothing/suit/monkeysuit,
/obj/item/clothing/head/cardborg,
/obj/item/clothing/suit/cardborg,
- /obj/item/clothing/head/xenos,
- /obj/item/clothing/suit/xenos,
- /obj/item/clothing/suit/hooded/ian_costume,
- /obj/item/clothing/suit/hooded/carp_costume,
- /obj/item/clothing/suit/hooded/bee_costume)
+ /obj/item/clothing/suit/hooded/carp_costume)
crate_name = "original costume crate"
crate_type = /obj/structure/closet/crate/wooden
@@ -143,7 +136,6 @@
/obj/item/clothing/neck/tie/blue,
/obj/item/clothing/neck/tie/red,
/obj/item/clothing/neck/tie/black,
- /obj/item/clothing/head/bowler,
/obj/item/clothing/head/fedora,
/obj/item/clothing/head/flatcap,
/obj/item/clothing/head/beret,
@@ -175,7 +167,6 @@
desc = "Flaunt your status with three unique, highly-collectable hats!"
cost = 20000
contains = list(/obj/item/clothing/head/collectable/chef,
- /obj/item/clothing/head/collectable/paper,
/obj/item/clothing/head/collectable/tophat,
/obj/item/clothing/head/collectable/captain,
/obj/item/clothing/head/collectable/beret,
@@ -183,18 +174,11 @@
/obj/item/clothing/head/collectable/flatcap,
/obj/item/clothing/head/collectable/pirate,
/obj/item/clothing/head/collectable/kitty,
- /obj/item/clothing/head/collectable/rabbitears,
/obj/item/clothing/head/collectable/wizard,
/obj/item/clothing/head/collectable/hardhat,
- /obj/item/clothing/head/collectable/HoS,
- /obj/item/clothing/head/collectable/HoP,
/obj/item/clothing/head/collectable/thunderdome,
/obj/item/clothing/head/collectable/swat,
- /obj/item/clothing/head/collectable/slime,
- /obj/item/clothing/head/collectable/police,
- /obj/item/clothing/head/collectable/slime,
- /obj/item/clothing/head/collectable/xenom,
- /obj/item/clothing/head/collectable/petehat)
+ /obj/item/clothing/head/collectable/police)
crate_name = "collectable hats crate"
crate_type = /obj/structure/closet/crate/wooden
diff --git a/code/modules/cargo/packs/food.dm b/code/modules/cargo/packs/food.dm
index f2b9d0ec09a7..3eb7f33cbe4c 100644
--- a/code/modules/cargo/packs/food.dm
+++ b/code/modules/cargo/packs/food.dm
@@ -64,12 +64,12 @@
name = "Basic Ingredients Crate"
desc = "Get things cooking with this crate full of useful ingredients! Contains a dozen eggs, two slabs of meat, some flour, some rice, a bottle of milk, a bottle of soymilk, and a bag of sugar."
cost = 300
- contains = list(/obj/item/reagent_containers/food/condiment/flour,
- /obj/item/reagent_containers/food/condiment/flour,
- /obj/item/reagent_containers/food/condiment/rice,
- /obj/item/reagent_containers/food/condiment/milk,
- /obj/item/reagent_containers/food/condiment/soymilk,
- /obj/item/reagent_containers/food/condiment/sugar,
+ contains = list(/obj/item/reagent_containers/condiment/flour,
+ /obj/item/reagent_containers/condiment/flour,
+ /obj/item/reagent_containers/condiment/rice,
+ /obj/item/reagent_containers/condiment/milk,
+ /obj/item/reagent_containers/condiment/soymilk,
+ /obj/item/reagent_containers/condiment/sugar,
/obj/item/storage/fancy/egg_box,
/obj/item/reagent_containers/food/snacks/meat/slab,
/obj/item/reagent_containers/food/snacks/meat/slab
@@ -81,13 +81,13 @@
name = "Condiments Crate"
desc = "A variety of garnishes for topping off your dish with a little extra pizzaz. Contains a bottle of enzyme, a salt shaker, a pepper mill, a bottle of ketchup, a bottle of hot sauce, a bottle of BBQ sauce, and a bottle of cream."
cost = 250
- contains = list(/obj/item/reagent_containers/food/condiment/enzyme,
- /obj/item/reagent_containers/food/condiment/saltshaker,
- /obj/item/reagent_containers/food/condiment/peppermill,
- /obj/item/reagent_containers/food/condiment/ketchup,
- /obj/item/reagent_containers/food/condiment/hotsauce,
+ contains = list(/obj/item/reagent_containers/condiment/enzyme,
+ /obj/item/reagent_containers/condiment/saltshaker,
+ /obj/item/reagent_containers/condiment/peppermill,
+ /obj/item/reagent_containers/condiment/ketchup,
+ /obj/item/reagent_containers/condiment/hotsauce,
/obj/item/reagent_containers/food/drinks/bottle/cream,
- /obj/item/reagent_containers/food/condiment/bbqsauce
+ /obj/item/reagent_containers/condiment/bbqsauce
)
crate_name = "condiments crate"
crate_type = /obj/structure/closet/crate/freezer
diff --git a/code/modules/cargo/packs/tools.dm b/code/modules/cargo/packs/tools.dm
index 25ed4aaab554..36bfefc02796 100644
--- a/code/modules/cargo/packs/tools.dm
+++ b/code/modules/cargo/packs/tools.dm
@@ -111,6 +111,13 @@
crate_name = "tank transfer valve crate"
crate_type = /obj/structure/closet/crate/secure/science
+/datum/supply_pack/tools/anglegrinder
+ name = "Angle Grinder"
+ desc = "Contains one angle grinder pack, a tool used for quick structure deconstruction and salvaging"
+ cost = 2000
+ contains = list(/obj/item/gear_pack/anglegrinder)
+ crate_name = "Angle Grinder"
+
/*
Liquid tanks
*/
@@ -146,3 +153,14 @@
contains = list(/obj/structure/reagent_dispensers/foamtank)
crate_name = "foam tank crate"
crate_type = /obj/structure/closet/crate/large
+
+/datum/supply_pack/tools/radfoamtank
+ name = "Radiation Foam Tank Crate"
+ desc = "Contains a tank of anti-radiation foam. Pressurized sprayer included!"
+ cost = 1500
+ contains = list(
+ /obj/item/watertank/anti_rad,
+ /obj/structure/reagent_dispensers/foamtank/antirad
+ )
+ crate_name = "foam tank crate"
+ crate_type = /obj/structure/closet/crate/large
diff --git a/code/modules/client/loadout/loadout_eyewear.dm b/code/modules/client/loadout/loadout_eyewear.dm
index 3ea37d68fed8..b6962a8dc34d 100644
--- a/code/modules/client/loadout/loadout_eyewear.dm
+++ b/code/modules/client/loadout/loadout_eyewear.dm
@@ -29,10 +29,6 @@
display_name = "eyepatch"
path = /obj/item/clothing/glasses/eyepatch
-/datum/gear/eyewear/monocle
- display_name = "monocle"
- path = /obj/item/clothing/glasses/monocle
-
/datum/gear/eyewear/cheapsuns
display_name = "cheap sunglasses"
path = /obj/item/clothing/glasses/cheapsuns
diff --git a/code/modules/client/loadout/loadout_hat.dm b/code/modules/client/loadout/loadout_hat.dm
index 32384a0d59fa..2f7e59c288b7 100644
--- a/code/modules/client/loadout/loadout_hat.dm
+++ b/code/modules/client/loadout/loadout_hat.dm
@@ -131,10 +131,6 @@
path = /obj/item/clothing/head/beanie/orange
//Misc
-/datum/gear/hat/bowler
- display_name = "bowler hat"
- path = /obj/item/clothing/head/bowler
-
/datum/gear/hat/that
display_name = "top hat"
path = /obj/item/clothing/head/that
diff --git a/code/modules/client/loadout/loadout_suit.dm b/code/modules/client/loadout/loadout_suit.dm
index 217998802d48..1d11857663ad 100644
--- a/code/modules/client/loadout/loadout_suit.dm
+++ b/code/modules/client/loadout/loadout_suit.dm
@@ -23,10 +23,6 @@
display_name = "leather jacket"
path = /obj/item/clothing/suit/jacket/leather
-/datum/gear/suit/jacket/leather/overcoat
- display_name = "leather overcoat"
- path = /obj/item/clothing/suit/jacket/leather/overcoat
-
/datum/gear/suit/jacket/leather/duster
display_name = "leather duster"
path = /obj/item/clothing/suit/jacket/leather/duster
@@ -105,10 +101,6 @@
path = /obj/item/clothing/suit/toggle/suspenders/gray
//Misc
-/datum/gear/suit/grponcho
- display_name = "poncho, green"
- path = /obj/item/clothing/suit/poncho/green
-
/datum/gear/suit/overalls
display_name = "overalls"
path = /obj/item/clothing/suit/apron/overalls
diff --git a/code/modules/clothing/factions/nanotrasen.dm b/code/modules/clothing/factions/nanotrasen.dm
index 7aa871ad7f3e..6e605d5471b2 100644
--- a/code/modules/clothing/factions/nanotrasen.dm
+++ b/code/modules/clothing/factions/nanotrasen.dm
@@ -337,7 +337,7 @@
icon_state = "officer_peaked"
item_state = "bluecloth"
-/obj/item/clothing/head/nanotrasen/officer
+/obj/item/clothing/head/nanotrasen/officer/fedora
name = "officer's fedora"
desc = "A fedora in a violent shade of Nanotrasen Blue, with a red silk band."
icon_state = "officer_fedora"
diff --git a/code/modules/clothing/glasses/_glasses.dm b/code/modules/clothing/glasses/_glasses.dm
index e011028246b6..c2dd59ecc1fb 100644
--- a/code/modules/clothing/glasses/_glasses.dm
+++ b/code/modules/clothing/glasses/_glasses.dm
@@ -1,7 +1,8 @@
//Glasses
/obj/item/clothing/glasses
name = "glasses"
- icon = 'icons/obj/clothing/glasses.dmi'
+ icon = 'icons/obj/clothing/eyes/eyes.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/eyes/eyes.dmi'
lefthand_file = 'icons/mob/inhands/clothing/glasses_lefthand.dmi'
righthand_file = 'icons/mob/inhands/clothing/glasses_righthand.dmi'
w_class = WEIGHT_CLASS_SMALL
@@ -43,8 +44,6 @@
user.update_sight()
if(icon_state == "welding-g")
change_glass_color(user, /datum/client_colour/glass_colour/gray)
- else if(icon_state == "bustin-g")
- change_glass_color(user, /datum/client_colour/glass_colour/green)
else
change_glass_color(user, null)
@@ -82,19 +81,6 @@
lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
glass_colour_type = /datum/client_colour/glass_colour/green
-/obj/item/clothing/glasses/meson/gar
- name = "gar mesons"
- icon_state = "garm"
- item_state = "garm"
- desc = "Do the impossible, see the invisible!"
- force = 10
- throwforce = 10
- throw_speed = 4
- attack_verb = list("sliced")
- hitsound = 'sound/weapons/bladeslice.ogg'
- sharpness = IS_SHARP
- custom_price = 500
-
/obj/item/clothing/glasses/science
name = "science goggles"
desc = "A pair of snazzy goggles used to protect against chemical spills. Fitted with an analyzer for scanning items and reagents."
@@ -163,12 +149,6 @@
qdel(src)
user.put_in_hands(double_patch)
-/obj/item/clothing/glasses/monocle
- name = "monocle"
- desc = "Such a dapper eyepiece!"
- icon_state = "monocle"
- supports_variations = VOX_VARIATION
-
/obj/item/clothing/glasses/material
name = "optical material scanner"
desc = "Very confusing glasses."
@@ -182,19 +162,6 @@
desc = "Used by miners to detect ores deep within the rock."
darkness_view = 0
-/obj/item/clothing/glasses/material/mining/gar
- name = "gar material scanner"
- icon_state = "garm"
- item_state = "garm"
- desc = "Do the impossible, see the invisible!"
- force = 10
- throwforce = 20
- throw_speed = 4
- attack_verb = list("sliced")
- hitsound = 'sound/weapons/bladeslice.ogg'
- sharpness = IS_SHARP
- glass_colour_type = /datum/client_colour/glass_colour/lightgreen
-
/obj/item/clothing/glasses/regular
name = "prescription glasses"
desc = "Made by Nerd. Co."
@@ -263,48 +230,6 @@
clothing_flags = SCAN_REAGENTS
glass_colour_type = /datum/client_colour/glass_colour/darkpurple
-/obj/item/clothing/glasses/sunglasses/garb
- name = "black gar glasses"
- desc = "Go beyond impossible and kick reason to the curb!"
- icon_state = "garb"
- item_state = "garb"
- force = 10
- throwforce = 10
- throw_speed = 4
- attack_verb = list("sliced")
- hitsound = 'sound/weapons/bladeslice.ogg'
- sharpness = IS_SHARP
-
-/obj/item/clothing/glasses/sunglasses/garb/supergarb
- name = "black giga gar glasses"
- desc = "Believe in us humans."
- icon_state = "supergarb"
- item_state = "garb"
- force = 12
- throwforce = 12
-
-/obj/item/clothing/glasses/sunglasses/gar
- name = "gar glasses"
- desc = "Just who the hell do you think I am?!"
- icon_state = "gar"
- item_state = "gar"
- force = 10
- throwforce = 10
- throw_speed = 4
- attack_verb = list("sliced")
- hitsound = 'sound/weapons/bladeslice.ogg'
- sharpness = IS_SHARP
- glass_colour_type = /datum/client_colour/glass_colour/orange
-
-/obj/item/clothing/glasses/sunglasses/gar/supergar
- name = "giga gar glasses"
- desc = "We evolve past the person we were a minute before. Little by little we advance with each turn. That's how a drill works!"
- icon_state = "supergar"
- item_state = "gar"
- force = 12
- throwforce = 12
- glass_colour_type = /datum/client_colour/glass_colour/red
-
/obj/item/clothing/glasses/sunglasses/ballistic
name = "ballistic goggles"
desc = "A pair of flash-proof ballistic goggles."
@@ -330,17 +255,6 @@
/obj/item/clothing/glasses/welding/attack_self(mob/user)
weldingvisortoggle(user)
-/obj/item/clothing/glasses/welding/ghostbuster
- name = "optical ecto-scanner"
- desc = "A bulky pair of unwieldy glasses that lets you see things best left unseen. Obscures vision, but also gives a bit of eye protection"
- icon_state = "bustin-g"
- item_state = "bustin-g"
- invis_view = SEE_INVISIBLE_OBSERVER
- invis_override = null
- flash_protect = 1
- visor_vars_to_toggle = VISOR_FLASHPROTECT | VISOR_TINT | VISOR_INVISVIEW
- glass_colour_type = /datum/client_colour/glass_colour/green
-
/obj/item/clothing/glasses/blindfold
name = "blindfold"
desc = "Covers the eyes, preventing sight."
@@ -389,7 +303,7 @@
. = ..()
if(!isinhands && ishuman(loc) && !colored_before)
var/mob/living/carbon/human/H = loc
- var/mutable_appearance/M = mutable_appearance('icons/mob/clothing/eyes.dmi', "blindfoldwhite")
+ var/mutable_appearance/M = mutable_appearance('icons/mob/clothing/eyes/eyes.dmi', "blindfoldwhite")
M.appearance_flags |= RESET_COLOR
M.color = "#[H.eye_color]"
. += M
@@ -455,20 +369,6 @@
return
chameleon_action.emp_randomise()
-/obj/item/clothing/glasses/thermal/monocle
- name = "thermoncle"
- desc = "Never before has seeing through walls felt so gentlepersonly."
- icon_state = "thermoncle"
- flags_1 = null //doesn't protect eyes because it's a monocle, duh
-
-/obj/item/clothing/glasses/thermal/monocle/examine(mob/user) //Different examiners see a different description!
- if(user.gender == MALE)
- desc = replacetext(desc, "person", "man")
- else if(user.gender == FEMALE)
- desc = replacetext(desc, "person", "woman")
- . = ..()
- desc = initial(desc)
-
/obj/item/clothing/glasses/thermal/eyepatch
name = "optical thermal eyepatch"
desc = "An eyepatch with built-in thermal optics."
@@ -516,35 +416,6 @@
item_state = "redglasses"
glass_colour_type = /datum/client_colour/glass_colour/red
-/obj/item/clothing/glasses/godeye
- name = "eye of god"
- desc = "A strange eye, said to have been torn from an omniscient creature that used to roam the wastes."
- icon_state = "godeye"
- item_state = "godeye"
- vision_flags = SEE_TURFS|SEE_MOBS|SEE_OBJS
- darkness_view = 8
- lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
- resistance_flags = LAVA_PROOF | FIRE_PROOF
- clothing_flags = SCAN_REAGENTS
-
-/obj/item/clothing/glasses/godeye/Initialize()
- . = ..()
- ADD_TRAIT(src, TRAIT_NODROP, EYE_OF_GOD_TRAIT)
-
-/obj/item/clothing/glasses/godeye/attackby(obj/item/W as obj, mob/user as mob, params)
- if(istype(W, src) && W != src && W.loc == user)
- if(W.icon_state == "godeye")
- W.icon_state = "doublegodeye"
- W.item_state = "doublegodeye"
- W.desc = "A pair of strange eyes, said to have been torn from an omniscient creature that used to roam the wastes. There's no real reason to have two, but that isn't stopping you."
- if(iscarbon(user))
- var/mob/living/carbon/C = user
- C.update_inv_wear_mask()
- else
- to_chat(user, "The eye winks at you and vanishes into the abyss, you feel really unlucky.")
- qdel(src)
- ..()
-
/obj/item/clothing/glasses/AltClick(mob/user)
if(glass_colour_type && ishuman(user))
var/mob/living/carbon/human/H = user
diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm
index 559816007b13..6891ac7de31a 100644
--- a/code/modules/clothing/glasses/hud.dm
+++ b/code/modules/clothing/glasses/hud.dm
@@ -162,26 +162,6 @@
lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE
glass_colour_type = /datum/client_colour/glass_colour/green
-/obj/item/clothing/glasses/hud/security/sunglasses/gars
- name = "\improper HUD gar glasses"
- desc = "GAR glasses with a HUD."
- icon_state = "gars"
- item_state = "garb"
- force = 10
- throwforce = 10
- throw_speed = 4
- attack_verb = list("sliced")
- hitsound = 'sound/weapons/bladeslice.ogg'
- sharpness = IS_SHARP
-
-/obj/item/clothing/glasses/hud/security/sunglasses/gars/supergars
- name = "giga HUD gar glasses"
- desc = "GIGA GAR glasses with a HUD."
- icon_state = "supergars"
- item_state = "garb"
- force = 12
- throwforce = 12
-
/obj/item/clothing/glasses/hud/toggle
name = "Toggle HUD"
desc = "A hud with multiple functions."
diff --git a/code/modules/clothing/head/beanie.dm b/code/modules/clothing/head/beanie.dm
index 5aa39eb0ba57..3a930d728ad7 100644
--- a/code/modules/clothing/head/beanie.dm
+++ b/code/modules/clothing/head/beanie.dm
@@ -53,10 +53,6 @@
//Striped Beanies have unique sprites
-/obj/item/clothing/head/beanie/christmas
- name = "christmas beanie"
- icon_state = "beaniechristmas"
-
/obj/item/clothing/head/beanie/striped
name = "striped beanie"
icon_state = "beaniestriped"
@@ -78,15 +74,3 @@
desc = "A beanie made from durathread, its resilient fibres provide some protection to the wearer."
icon_state = "beaniedurathread"
armor = list("melee" = 15, "bullet" = 5, "laser" = 15, "energy" = 25, "bomb" = 10, "bio" = 0, "rad" = 0, "fire" = 30, "acid" = 5)
-
-/obj/item/clothing/head/beanie/waldo
- name = "red striped bobble hat"
- desc = "If you're going on a worldwide hike, you'll need some cold protection."
- icon_state = "waldo_hat"
-
-/obj/item/clothing/head/beanie/rasta
- name = "rastacap"
- desc = "Perfect for tucking in those dreadlocks."
- icon_state = "beanierasta"
-
-//No dog fashion sprites yet :( poor Ian can't be dope like the rest of us yet
diff --git a/code/modules/clothing/head/berets.dm b/code/modules/clothing/head/berets.dm
index 9d3ca21ed4f0..78d77908cd30 100644
--- a/code/modules/clothing/head/berets.dm
+++ b/code/modules/clothing/head/berets.dm
@@ -5,18 +5,6 @@
icon_state = "beret"
dog_fashion = /datum/dog_fashion/head/beret
-/obj/item/clothing/head/beret/vintage
- name = "vintage beret"
- desc = "A well-worn beret."
- icon_state = "vintageberet"
- dog_fashion = null
-
-/obj/item/clothing/head/beret/archaic
- name = "archaic beret"
- desc = "An absolutely ancient beret."
- icon_state = "archaicberet"
- dog_fashion = null
-
/obj/item/clothing/head/beret/black
name = "black beret"
desc = "A black beret."
diff --git a/code/modules/clothing/head/collectable.dm b/code/modules/clothing/head/collectable.dm
index 036d6ffbd417..9aa05ea897ce 100644
--- a/code/modules/clothing/head/collectable.dm
+++ b/code/modules/clothing/head/collectable.dm
@@ -5,17 +5,6 @@
name = "collectable hat"
desc = "A rare collectable hat."
-/obj/item/clothing/head/collectable/petehat
- name = "ultra rare Pete's hat!"
- desc = "It smells faintly of plasma."
- icon_state = "petehat"
-
-/obj/item/clothing/head/collectable/xenom
- name = "collectable xenomorph helmet!"
- desc = "Hiss hiss hiss!"
- clothing_flags = SNUG_FIT
- icon_state = "xenom"
-
/obj/item/clothing/head/collectable/chef
name = "collectable chef's hat"
desc = "A rare chef's hat meant for hat collectors!"
@@ -24,12 +13,6 @@
dog_fashion = /datum/dog_fashion/head/chef
-/obj/item/clothing/head/collectable/paper
- name = "collectable paper hat"
- desc = "What looks like an ordinary paper hat is actually a rare and valuable collector's edition paper hat. Keep away from water, fire, and Curators."
- icon_state = "paper"
- dog_fashion = /datum/dog_fashion/head
-
/obj/item/clothing/head/collectable/tophat
name = "collectable top hat"
desc = "A top hat worn by only the most prestigious hat collectors."
@@ -64,12 +47,6 @@
item_state = "welding"
clothing_flags = SNUG_FIT
-/obj/item/clothing/head/collectable/slime
- name = "collectable slime hat"
- desc = "Just like a real brain slug!"
- icon_state = "headslime"
- clothing_flags = SNUG_FIT
-
/obj/item/clothing/head/collectable/flatcap
name = "collectable flat cap"
desc = "A collectible laborer's flat cap! Smells like No. 9 coal..."
@@ -91,13 +68,6 @@
dog_fashion = /datum/dog_fashion/head/kitty
-/obj/item/clothing/head/collectable/rabbitears
- name = "collectable rabbit ears"
- desc = "Not as lucky as the feet!"
- icon_state = "bunny"
-
- dog_fashion = /datum/dog_fashion/head/rabbit
-
/obj/item/clothing/head/collectable/wizard
name = "collectable wizard's hat"
desc = "NOTE: Any magical powers gained from wearing this hat are purely coincidental."
@@ -111,16 +81,6 @@
icon_state = "hardhat_standard"
dog_fashion = /datum/dog_fashion/head
-/obj/item/clothing/head/collectable/HoS
- name = "collectable HoS hat"
- desc = "Now you too can beat prisoners, set silly sentences, and arrest for no reason!"
- icon_state = "hoscap"
-
-/obj/item/clothing/head/collectable/HoP
- name = "collectable HoP hat"
- desc = "It's your turn to demand excessive paperwork, signatures, stamps, and hire more clowns! Papers, please!"
- icon_state = "hopcap_nt"
- dog_fashion = /datum/dog_fashion/head/head_of_personnel
/obj/item/clothing/head/collectable/thunderdome
name = "collectable Thunderdome helmet"
diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm
index 3e04245e1a14..416fa20df39c 100644
--- a/code/modules/clothing/head/jobs.dm
+++ b/code/modules/clothing/head/jobs.dm
@@ -33,10 +33,6 @@
desc = "A commanding white stetson adorned with a general's badge. Why this belongs to a captain is anybody's guess."
icon_state = "cowboycap"
-/obj/item/clothing/head/caphat/nt
- name = "captain's hat"
- icon_state = "captain_nt"
-
/obj/item/clothing/head/frontier/peaked
name = "\improper Frontiersmen commander's cap"
desc = "An imposing peaked cap, meant for a commander of the Frontiersmen."
@@ -47,41 +43,6 @@
desc = "An imposing peaked cap meant for only the highest of officers of the Frontiersmen pirate fleet."
icon_state = "frontier_admiral_cap"
-//Head of Personnel
-/obj/item/clothing/head/hopcap
- name = "head of personnel's cap"
- icon_state = "hopcap"
- desc = "The symbol of true bureaucratic micromanagement."
- dog_fashion = /datum/dog_fashion/head/head_of_personnel
-
-/obj/item/clothing/head/hopcap/nt
- icon_state = "hopcap_nt"
- dog_fashion = /datum/dog_fashion/head/head_of_personnel
-
-//Cargo
-/obj/item/clothing/head/supply_chief
- name = "supply chief's cap"
- desc = "The one thing between you and 40 boxes of orderable pizza is the person wearing this hat."
- icon_state = "supply_chief_cap"
-
-/obj/item/clothing/head/deliveries_officer
- name = "deliveries officer's cap"
- desc = "Whether through fires, the vacuum of space, or hordes of souless husks of grey suited criminals, your crate will always be delivered!"
- icon_state = "deliveries_officer_cap"
-
-//Chaplain
-/obj/item/clothing/head/nun_hood
- name = "nun hood"
- desc = "Maximum piety in this star system."
- icon_state = "nun_hood"
- flags_inv = HIDEHAIR
- flags_cover = HEADCOVERSEYES
-
-/obj/item/clothing/head/bishopmitre
- name = "bishop mitre"
- desc = "An opulent hat that functions as a radio to God. Or as a lightning rod, depending on who you ask."
- icon_state = "bishopmitre"
-
//Detective
/obj/item/clothing/head/fedora/det_hat
name = "detective's fedora"
@@ -252,12 +213,3 @@
#undef DRILL_SHOUTING
#undef DRILL_YELLING
#undef DRILL_CANADIAN
-
-/obj/item/clothing/head/witchunter
- name = "witchunter hat"
- desc = "This hat saw much use back in the day."
- icon_state = "witchhunterhat"
- item_state = "witchhunterhat"
- flags_cover = HEADCOVERSEYES
- flags_inv = HIDEEYES|HIDEHAIR
- armor = list("melee" = 30, "bullet" = 10, "laser" = 10, "energy" = 10, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 80)
diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm
index 61f032b5ef61..b2636b02871b 100644
--- a/code/modules/clothing/head/misc.dm
+++ b/code/modules/clothing/head/misc.dm
@@ -17,18 +17,6 @@
armor = list("melee" = 30, "bullet" = 15, "laser" = 30, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
strip_delay = (8 SECONDS)
-/obj/item/clothing/head/spacepolice
- name = "space police cap"
- desc = "A blue cap for patrolling the daily beat."
- icon_state = "policecap_families"
- item_state = "policecap_families"
-
-/obj/item/clothing/head/powdered_wig
- name = "powdered wig"
- desc = "A powdered wig."
- icon_state = "pwig"
- item_state = "pwig"
-
/obj/item/clothing/head/that
name = "top-hat"
desc = "It's an amish looking hat."
@@ -37,30 +25,6 @@
dog_fashion = /datum/dog_fashion/head
throwforce = 1
-/obj/item/clothing/head/canada
- name = "striped red tophat"
- desc = "It smells like fresh donut holes. / Il sent comme des trous de beignets frais."
- icon_state = "canada"
- item_state = "canada"
-
-/obj/item/clothing/head/redcoat
- name = "redcoat's hat"
- icon_state = "redcoat"
- desc = "'I guess it's a redhead.'"
-
-/obj/item/clothing/head/plaguedoctorhat
- name = "plague doctor's hat"
- desc = "These were once used by plague doctors. They're pretty much useless."
- icon_state = "plaguedoctor"
- permeability_coefficient = 0.01
-
-/obj/item/clothing/head/hasturhood
- name = "hastur's hood"
- desc = "It's unspeakably stylish."
- icon_state = "hasturhood"
- flags_inv = HIDEHAIR
- flags_cover = HEADCOVERSEYES
-
/obj/item/clothing/head/nursehat
name = "nurse's hat"
desc = "It allows quick identification of trained medical personnel."
@@ -78,15 +42,6 @@
clothing_flags = SNUG_FIT
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
-/obj/item/clothing/head/cueball
- name = "cueball helmet"
- desc = "A large, featureless white orb meant to be worn on your head. How do you even see out of this thing?"
- icon_state = "cueball"
- item_state="cueball"
- clothing_flags = SNUG_FIT
- flags_cover = HEADCOVERSEYES|HEADCOVERSMOUTH
- flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
-
/obj/item/clothing/head/snowman
name = "Snowman Head"
desc = "A ball of white styrofoam. So festive."
@@ -96,38 +51,6 @@
flags_cover = HEADCOVERSEYES
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
-/obj/item/clothing/head/justice
- name = "justice hat"
- desc = "Fight for what's righteous!"
- icon_state = "justicered"
- item_state = "justicered"
- clothing_flags = SNUG_FIT
- flags_inv = HIDEHAIR|HIDEEARS|HIDEEYES|HIDEFACE|HIDEFACIALHAIR
- flags_cover = HEADCOVERSEYES
-
-/obj/item/clothing/head/justice/blue
- icon_state = "justiceblue"
- item_state = "justiceblue"
-
-/obj/item/clothing/head/justice/yellow
- icon_state = "justiceyellow"
- item_state = "justiceyellow"
-
-/obj/item/clothing/head/justice/green
- icon_state = "justicegreen"
- item_state = "justicegreen"
-
-/obj/item/clothing/head/justice/pink
- icon_state = "justicepink"
- item_state = "justicepink"
-
-/obj/item/clothing/head/rabbitears
- name = "rabbit ears"
- desc = "A headband with a pair of faux rabbit ears."
- icon_state = "bunny"
-
- dog_fashion = /datum/dog_fashion/head/rabbit
-
/obj/item/clothing/head/pirate
name = "pirate hat"
desc = "Yarr."
@@ -170,42 +93,12 @@
icon_state = "bandana"
item_state = "bandana"
-/obj/item/clothing/head/bowler
- name = "bowler-hat"
- desc = "Gentleman, elite aboard!"
- icon_state = "bowler"
- item_state = "bowler"
-
-/obj/item/clothing/head/witchwig
- name = "witch costume wig"
- desc = "Eeeee~heheheheheheh!"
- icon_state = "witch"
- item_state = "witch"
- flags_inv = HIDEHAIR
-
-/obj/item/clothing/head/chicken
- name = "chicken suit head"
- desc = "Bkaw!"
- icon_state = "chickenhead"
- item_state = "chickensuit"
- clothing_flags = SNUG_FIT
- flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
-
/obj/item/clothing/head/bearpelt
name = "bear pelt hat"
desc = "Fuzzy."
icon_state = "bearpelt"
item_state = "bearpelt"
-/obj/item/clothing/head/xenos
- name = "xenos helmet"
- icon_state = "xenos"
- item_state = "xenos_helm"
- desc = "A helmet made out of chitinous alien hide."
- clothing_flags = SNUG_FIT
- flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
- flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
-
/obj/item/clothing/head/fedora
name = "fedora"
icon_state = "fedora"
@@ -229,34 +122,6 @@
item_state = "hat_solgov"
desc = "A slick blue hat used by both solarian civilians and physicists."
-/obj/item/clothing/head/sombrero
- name = "sombrero"
- icon_state = "sombrero"
- item_state = "sombrero"
- desc = "You can practically taste the fiesta."
- flags_inv = HIDEHAIR
-
- dog_fashion = /datum/dog_fashion/head/sombrero
-
-/obj/item/clothing/head/sombrero/green
- name = "green sombrero"
- icon_state = "greensombrero"
- item_state = "greensombrero"
- desc = "As elegant as a dancing cactus."
- flags_inv = HIDEHAIR|HIDEFACE|HIDEEARS
- dog_fashion = null
-
-/obj/item/clothing/head/sombrero/shamebrero
- name = "shamebrero"
- icon_state = "shamebrero"
- item_state = "shamebrero"
- desc = "Once it's on, it never comes off."
- dog_fashion = null
-
-/obj/item/clothing/head/sombrero/shamebrero/Initialize()
- . = ..()
- ADD_TRAIT(src, TRAIT_NODROP, SHAMEBRERO_TRAIT)
-
/obj/item/clothing/head/flatcap
name = "flat cap"
desc = "A working man's hat."
@@ -297,14 +162,6 @@
min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT
dog_fashion = /datum/dog_fashion/head/santa
-/obj/item/clothing/head/jester
- name = "jester hat"
- desc = "A hat with bells, to add some merriness to the suit."
- icon_state = "jester_hat"
-
-/obj/item/clothing/head/jester/alt
- icon_state = "jester2"
-
/obj/item/clothing/head/rice_hat
name = "rice hat"
desc = "Welcome to the rice fields, motherfucker."
@@ -328,45 +185,6 @@
icon_state = "crown"
resistance_flags = FIRE_PROOF
-/obj/item/clothing/head/crown/fancy
- name = "magnificent crown"
- desc = "A crown worn by only the highest emperors of the land space."
- icon_state = "fancycrown"
-
-/obj/item/clothing/head/scarecrow_hat
- name = "scarecrow hat"
- desc = "A simple straw hat."
- icon_state = "scarecrow_hat"
-
-/obj/item/clothing/head/lobsterhat
- name = "foam lobster head"
- desc = "When everything's going to crab, protecting your head is the best choice."
- icon_state = "lobster_hat"
- clothing_flags = SNUG_FIT
- flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
-
-/obj/item/clothing/head/drfreezehat
- name = "doctor freeze's wig"
- desc = "A cool wig for cool people."
- icon_state = "drfreeze_hat"
- flags_inv = HIDEHAIR
-
-/obj/item/clothing/head/pharaoh
- name = "pharaoh hat"
- desc = "Walk like an Egyptian."
- icon_state = "pharoah_hat"
- item_state = "pharoah_hat"
-
-/obj/item/clothing/head/nemes
- name = "headdress of Nemes"
- desc = "Lavish space tomb not included."
- icon_state = "nemes_headdress"
-
-/obj/item/clothing/head/delinquent
- name = "delinquent hat"
- desc = "Good grief."
- icon_state = "delinquent"
-
/obj/item/clothing/head/frenchberet
name = "french beret"
desc = "A quality beret, infused with the aroma of chain-smoking, wine-swilling Parisians. You feel less inclined to engage in military conflict, for some reason."
@@ -402,56 +220,12 @@
message += pick(" Honh honh honh!"," Honh!"," Zut Alors!")
speech_args[SPEECH_MESSAGE] = trim(message)
-/obj/item/clothing/head/clownmitre
- name = "Hat of the Honkmother"
- desc = "It's hard for parishoners to see a banana peel on the floor when they're looking up at your glorious chapeau."
- icon_state = "clownmitre"
-
-/obj/item/clothing/head/kippah
- name = "kippah"
- desc = "Signals that you follow the Jewish Halakha. Keeps the head covered and the soul extra-Orthodox."
- icon_state = "kippah"
-
-/obj/item/clothing/head/taqiyahwhite
- name = "white taqiyah"
- desc = "An extra-mustahabb way of showing your devotion to Allah."
- icon_state = "taqiyahwhite"
- pocket_storage_component_path = /datum/component/storage/concrete/pockets/small
-
-/obj/item/clothing/head/taqiyahred
- name = "red taqiyah"
- desc = "An extra-mustahabb way of showing your devotion to Allah."
- icon_state = "taqiyahred"
- pocket_storage_component_path = /datum/component/storage/concrete/pockets/small
-
-/obj/item/clothing/head/shrine_wig
- name = "shrine maiden's wig"
- desc = "Purify in style!"
- flags_inv = HIDEHAIR //bald
- mob_overlay_icon = 'icons/mob/large-worn-icons/64x64/head.dmi'
- icon_state = "shrine_wig"
- item_state = "shrine_wig"
- worn_x_dimension = 64
- worn_y_dimension = 64
-
/obj/item/clothing/head/intern
name = "\improper CentCom Head Intern beancap"
desc = "A horrifying mix of beanie and softcap in CentCom green. You'd have to be pretty desperate for power over your peers to agree to wear this."
icon_state = "intern_hat"
item_state = "intern_hat"
-/obj/item/clothing/head/goatpelt
- name = "goat pelt hat"
- desc = "Fuzzy and Warm!"
- icon_state = "goatpelt"
- item_state = "goatpelt"
-
-/obj/item/clothing/head/jackbros
- name = "frosty hat"
- desc = "Hee-ho!"
- icon_state = "JackFrostHat"
- item_state = "JackFrostHat"
-
/obj/item/clothing/head/maidheadband/syndicate
name = "tactical maid headband"
desc = "Tacticute."
diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm
index 5b8e228b49ee..3cd7c022887c 100644
--- a/code/modules/clothing/head/misc_special.dm
+++ b/code/modules/clothing/head/misc_special.dm
@@ -33,82 +33,6 @@
/obj/item/clothing/head/welding/attack_self(mob/user)
weldingvisortoggle(user)
-/*
- * Cakehat
- */
-/obj/item/clothing/head/hardhat/cakehat
- name = "cakehat"
- desc = "You put the cake on your head. Brilliant."
- icon_state = "hardhat_cakehat"
- item_state = "hardhat_cakehat"
- lefthand_file = 'icons/mob/inhands/clothing_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/clothing_righthand.dmi'
- hitsound = 'sound/weapons/tap.ogg'
- var/hitsound_on = 'sound/weapons/sear.ogg' //so we can differentiate between cakehat and energyhat
- var/hitsound_off = 'sound/weapons/tap.ogg'
- var/force_on = 15
- var/throwforce_on = 15
- var/damtype_on = BURN
- flags_inv = HIDEEARS|HIDEHAIR
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
- light_range = 2 //luminosity when on
- flags_cover = HEADCOVERSEYES
- heat = 999
-
- dog_fashion = /datum/dog_fashion/head
-
-/obj/item/clothing/head/hardhat/cakehat/process()
- var/turf/location = src.loc
- if(ishuman(location))
- var/mob/living/carbon/human/M = location
- if(M.is_holding(src) || M.head == src)
- location = M.loc
-
- if(isturf(location))
- location.hotspot_expose(700, 1)
-
-/obj/item/clothing/head/hardhat/cakehat/turn_on(mob/living/user)
- ..()
- force = force_on
- throwforce = throwforce_on
- damtype = damtype_on
- hitsound = hitsound_on
- START_PROCESSING(SSobj, src)
-
-/obj/item/clothing/head/hardhat/cakehat/turn_off(mob/living/user)
- ..()
- force = 0
- throwforce = 0
- damtype = BRUTE
- hitsound = hitsound_off
- STOP_PROCESSING(SSobj, src)
-
-/obj/item/clothing/head/hardhat/cakehat/get_temperature()
- return on * heat
-
-/obj/item/clothing/head/hardhat/cakehat/energycake
- name = "energy cake"
- desc = "You put the energy sword on your cake. Brilliant."
- icon_state = "hardhat_energycake"
- item_state = "hardhat_energycake"
- hitsound = 'sound/weapons/tap.ogg'
- hitsound_on = 'sound/weapons/blade1.ogg'
- hitsound_off = 'sound/weapons/tap.ogg'
- damtype_on = BRUTE
- force_on = 18 //same as epen (but much more obvious)
- light_range = 3 //ditto
- heat = 0
-
-/obj/item/clothing/head/hardhat/cakehat/energycake/turn_on(mob/living/user)
- playsound(user, 'sound/weapons/saberon.ogg', 5, TRUE)
- to_chat(user, "You turn on \the [src].")
- ..()
-
-/obj/item/clothing/head/hardhat/cakehat/energycake/turn_off(mob/living/user)
- playsound(user, 'sound/weapons/saberoff.ogg', 5, TRUE)
- to_chat(user, "You turn off \the [src].")
- ..()
-
/*
* Trapper Hat
*/
@@ -181,17 +105,6 @@
if(ishuman(user))
add_atom_colour("#[user.hair_color]", FIXED_COLOUR_PRIORITY)
-/obj/item/clothing/head/hardhat/reindeer
- name = "novelty reindeer hat"
- desc = "Some fake antlers and a very fake red nose."
- icon_state = "hardhat_reindeer"
- item_state = "hardhat_reindeer"
- flags_inv = 0
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
- light_range = 1 //luminosity when on
-
- dog_fashion = /datum/dog_fashion/head/reindeer
-
/obj/item/clothing/head/cardborg
name = "cardborg helmet"
desc = "A helmet made out of a box."
@@ -304,69 +217,6 @@
flags_inv = HIDEEARS|HIDEHAIR
armor = list("melee" = 5, "bullet" = 0, "laser" = -5, "energy" = -15, "bomb" = 10, "bio" = 0, "rad" = 0, "fire" = 20, "acid" = 20)
-/obj/item/clothing/head/foilhat
- name = "tinfoil hat"
- desc = "Thought control rays, psychotronic scanning. Don't mind that, I'm protected cause I made this hat."
- icon_state = "foilhat"
- item_state = "foilhat"
- armor = list("melee" = 0, "bullet" = 0, "laser" = -5,"energy" = -15, "bomb" = 0, "bio" = 0, "rad" = -5, "fire" = 0, "acid" = 0)
- equip_delay_other = 140
- clothing_flags = ANTI_TINFOIL_MANEUVER
- var/datum/brain_trauma/mild/phobia/conspiracies/paranoia
- var/warped = FALSE
-
-/obj/item/clothing/head/foilhat/equipped(mob/living/carbon/human/user, slot)
- . = ..()
- if(slot != ITEM_SLOT_HEAD || warped)
- return
- if(paranoia)
- QDEL_NULL(paranoia)
- paranoia = new()
-
- user.gain_trauma(paranoia, TRAUMA_RESILIENCE_MAGIC)
- to_chat(user, "As you don the foiled hat, an entire world of conspiracy theories and seemingly insane ideas suddenly rush into your mind. What you once thought unbelievable suddenly seems.. undeniable. Everything is connected and nothing happens just by accident. You know too much and now they're out to get you. ")
-
-/obj/item/clothing/head/foilhat/MouseDrop(atom/over_object)
- //God Im sorry
- if(!warped && iscarbon(usr))
- var/mob/living/carbon/C = usr
- if(src == C.head)
- to_chat(C, "Why would you want to take this off? Do you want them to get into your mind?!")
- return
- return ..()
-
-/obj/item/clothing/head/foilhat/dropped(mob/user)
- . = ..()
- if(paranoia)
- QDEL_NULL(paranoia)
-
-/obj/item/clothing/head/foilhat/proc/warp_up()
- name = "scorched tinfoil hat"
- desc = "A badly warped up hat. Quite unprobable this will still work against any of fictional and contemporary dangers it used to."
- warped = TRUE
- clothing_flags &= ~ANTI_TINFOIL_MANEUVER
- if(!isliving(loc) || !paranoia)
- return
- var/mob/living/target = loc
- if(target.get_item_by_slot(ITEM_SLOT_HEAD) != src)
- return
- QDEL_NULL(paranoia)
- if(target.stat < UNCONSCIOUS)
- to_chat(target, "Your zealous conspirationism rapidly dissipates as the donned hat warps up into a ruined mess. All those theories starting to sound like nothing but a ridicolous fanfare.")
-
-/obj/item/clothing/head/foilhat/attack_hand(mob/user)
- if(!warped && iscarbon(user))
- var/mob/living/carbon/C = user
- if(src == C.head)
- to_chat(user, "Why would you want to take this off? Do you want them to get into your mind?!")
- return
- return ..()
-
-/obj/item/clothing/head/foilhat/microwave_act(obj/machinery/microwave/M)
- . = ..()
- if(!warped)
- warp_up()
-
/obj/item/clothing/head/plastic_flower
name = "plastic flower"
desc = "A realistic imitation of a flower. Not edible though."
diff --git a/code/modules/clothing/outfits/event.dm b/code/modules/clothing/outfits/event.dm
deleted file mode 100644
index 18af4e8b663f..000000000000
--- a/code/modules/clothing/outfits/event.dm
+++ /dev/null
@@ -1,26 +0,0 @@
-/datum/outfit/santa //ho ho ho!
- name = "Santa Claus"
-
- uniform = /obj/item/clothing/under/color/red
- shoes = /obj/item/clothing/shoes/sneakers/red
- suit = /obj/item/clothing/suit/space/santa
- head = /obj/item/clothing/head/santa
- back = /obj/item/storage/backpack/santabag
- r_pocket = /obj/item/flashlight
- gloves = /obj/item/clothing/gloves/color/red
-
- box = /obj/item/storage/box/survival/engineer
- backpack_contents = list(/obj/item/a_gift/anything = 5)
-
-/datum/outfit/santa/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
- if(visualsOnly)
- return
- H.fully_replace_character_name(H.real_name, "Santa Claus")
- H.mind.assigned_role = "Santa"
- H.mind.special_role = "Santa"
-
- H.hairstyle = "Long Hair 3"
- H.facial_hairstyle = "Beard (Full)"
- H.hair_color = "FFF"
- H.facial_hair_color = "FFF"
- H.update_hair()
diff --git a/code/modules/clothing/outfits/factions/independent.dm b/code/modules/clothing/outfits/factions/independent.dm
index 2b93739fb0f9..ba883d59f4dd 100644
--- a/code/modules/clothing/outfits/factions/independent.dm
+++ b/code/modules/clothing/outfits/factions/independent.dm
@@ -173,7 +173,6 @@
uniform = /obj/item/clothing/under/rank/command/head_of_personnel
dcoat = /obj/item/clothing/suit/hooded/wintercoat/captain
shoes = /obj/item/clothing/shoes/sneakers/brown
- head = /obj/item/clothing/head/hopcap
backpack_contents = list(/obj/item/storage/box/ids=1,\
/obj/item/melee/classic_baton/telescopic=1, /obj/item/modular_computer/tablet/preset/advanced = 1)
@@ -536,7 +535,6 @@
ears = /obj/item/radio/headset/headset_cargo
uniform = /obj/item/clothing/under/rank/cargo/qm
- head = /obj/item/clothing/head/supply_chief
dcoat = /obj/item/clothing/suit/hooded/wintercoat/cargo
shoes = /obj/item/clothing/shoes/sneakers/brown
glasses = /obj/item/clothing/glasses/sunglasses
diff --git a/code/modules/clothing/outfits/factions/nanotrasen.dm b/code/modules/clothing/outfits/factions/nanotrasen.dm
index e292a6e61d03..3c9e379e74db 100644
--- a/code/modules/clothing/outfits/factions/nanotrasen.dm
+++ b/code/modules/clothing/outfits/factions/nanotrasen.dm
@@ -401,6 +401,15 @@
shoes = /obj/item/clothing/shoes/sneakers/black
belt = /obj/item/pda
+// Janitor
+/datum/outfit/job/nanotrasen/janitor
+ name = "Nanotrasen - Janitor"
+ jobtype = /datum/job/janitor
+ job_icon = "janitor"
+
+ uniform = /obj/item/clothing/under/nanotrasen/janitor
+ head = /obj/item/clothing/head/nanotrasen/cap/janitor
+
// Lawyer
/datum/outfit/job/nanotrasen/lawyer
name = "Nanotrasen - Lawyer"
@@ -423,8 +432,6 @@
id_assignment = "Corporate Representative"
job_icon = "nanotrasen"
- uniform = /obj/item/clothing/under/rank/command/head_of_personnel/suit
- suit = null
ears = /obj/item/radio/headset/headset_cent
l_hand = /obj/item/clipboard
r_pocket = /obj/item/pen/fountain
@@ -495,7 +502,7 @@
gloves = /obj/item/clothing/gloves/color/black
uniform = /obj/item/clothing/under/rank/security/head_of_security/alt/lp
alt_uniform = /obj/item/clothing/under/rank/security/head_of_security/alt/skirt/lp
- dcoat = /obj/item/clothing/suit/jacket
+ dcoat = /obj/item/clothing/suit/armor/nanotrasen/sec_director
shoes = /obj/item/clothing/shoes/jackboots
head = /obj/item/clothing/head/beret/command
diff --git a/code/modules/clothing/outfits/standard.dm b/code/modules/clothing/outfits/standard.dm
index 11e8651891bc..108475c982b9 100644
--- a/code/modules/clothing/outfits/standard.dm
+++ b/code/modules/clothing/outfits/standard.dm
@@ -118,25 +118,6 @@
if(S)
S.owner = H
-/datum/outfit/wizard/apprentice
- name = "Wizard Apprentice"
- r_hand = null
- l_hand = null
- r_pocket = /obj/item/teleportation_scroll/apprentice
-
-/datum/outfit/wizard/red
- name = "Red Wizard"
-
- suit = /obj/item/clothing/suit/wizrobe/red
- head = /obj/item/clothing/head/wizard/red
-
-/datum/outfit/wizard/weeb
- name = "Marisa Wizard"
-
- suit = /obj/item/clothing/suit/wizrobe/marisa
- shoes = /obj/item/clothing/shoes/sandal/marisa
- head = /obj/item/clothing/head/wizard/marisa
-
/datum/outfit/plasmaman
name = "Plasmaman"
diff --git a/code/modules/clothing/shoes/bananashoes.dm b/code/modules/clothing/shoes/bananashoes.dm
deleted file mode 100644
index 4ed246a587be..000000000000
--- a/code/modules/clothing/shoes/bananashoes.dm
+++ /dev/null
@@ -1,68 +0,0 @@
-//banana flavored chaos and horror ahead
-
-/obj/item/clothing/shoes/clown_shoes/banana_shoes
- name = "mk-honk prototype shoes"
- desc = "Lost prototype of advanced clown tech. Powered by bananium, these shoes leave a trail of chaos in their wake."
- icon_state = "clown_prototype_off"
- actions_types = list(/datum/action/item_action/toggle)
- var/on = FALSE
- var/always_noslip = FALSE
-
-/obj/item/clothing/shoes/clown_shoes/banana_shoes/Initialize()
- . = ..()
- if(always_noslip)
- clothing_flags |= NOSLIP
-
-/obj/item/clothing/shoes/clown_shoes/banana_shoes/ComponentInitialize()
- . = ..()
- AddElement(/datum/element/update_icon_updates_onmob)
- AddComponent(/datum/component/material_container, list(/datum/material/hellstone), 200000, TRUE, /obj/item/stack)
- AddComponent(/datum/component/squeak, list('sound/items/bikehorn.ogg'=1), 75, falloff_exponent = 20)
-
-/obj/item/clothing/shoes/clown_shoes/banana_shoes/step_action()
- . = ..()
- var/mob/wearer = loc
- var/datum/component/material_container/bananium = GetComponent(/datum/component/material_container)
- if(on && istype(wearer))
- if(bananium.get_material_amount(/datum/material/hellstone) < 100)
- on = !on
- if(!always_noslip)
- clothing_flags &= ~NOSLIP
- update_appearance()
- to_chat(loc, "You ran out of bananium!")
- else
- new /obj/item/grown/bananapeel/specialpeel(get_step(src,turn(wearer.dir, 180))) //honk
- bananium.use_amount_mat(100, /datum/material/hellstone)
-
-/obj/item/clothing/shoes/clown_shoes/banana_shoes/attack_self(mob/user)
- var/datum/component/material_container/bananium = GetComponent(/datum/component/material_container)
- var/sheet_amount = bananium.retrieve_all()
- if(sheet_amount)
- to_chat(user, "You retrieve [sheet_amount] sheets of bananium from the prototype shoes.")
- else
- to_chat(user, "You cannot retrieve any bananium from the prototype shoes!")
-
-/obj/item/clothing/shoes/clown_shoes/banana_shoes/examine(mob/user)
- . = ..()
- . += "The shoes are [on ? "enabled" : "disabled"]."
-
-/obj/item/clothing/shoes/clown_shoes/banana_shoes/ui_action_click(mob/user)
- var/datum/component/material_container/bananium = GetComponent(/datum/component/material_container)
- if(bananium.get_material_amount(/datum/material/hellstone))
- on = !on
- update_appearance()
- to_chat(user, "You [on ? "activate" : "deactivate"] the prototype shoes.")
- if(!always_noslip)
- if(on)
- clothing_flags |= NOSLIP
- else
- clothing_flags &= ~NOSLIP
- else
- to_chat(user, "You need bananium to turn the prototype shoes on!")
-
-/obj/item/clothing/shoes/clown_shoes/banana_shoes/update_icon_state()
- if(on)
- icon_state = "clown_prototype_on"
- else
- icon_state = "clown_prototype_off"
- return ..()
diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm
index 9db073306680..234917e03d6d 100644
--- a/code/modules/clothing/shoes/miscellaneous.dm
+++ b/code/modules/clothing/shoes/miscellaneous.dm
@@ -16,23 +16,6 @@
lace_time = 12 SECONDS
greyscale_icon_state = "boots"
-/obj/item/clothing/shoes/combat/sneakboots
- name = "sneakboots"
- desc = "These boots have special noise cancelling soles. Perfect for stealth, if it wasn't for the color scheme."
- icon_state = "sneakboots"
- item_state = "sneakboots"
- w_class = WEIGHT_CLASS_SMALL
- resistance_flags = FIRE_PROOF | ACID_PROOF
-
-/obj/item/clothing/shoes/combat/sneakboots/equipped(mob/living/carbon/human/user, slot)
- . = ..()
- if(slot == ITEM_SLOT_FEET)
- ADD_TRAIT(user, TRAIT_SILENT_FOOTSTEPS, SHOES_TRAIT)
-
-/obj/item/clothing/shoes/combat/sneakboots/dropped(mob/living/carbon/human/user)
- REMOVE_TRAIT(user, TRAIT_SILENT_FOOTSTEPS, SHOES_TRAIT)
- return ..()
-
/obj/item/clothing/shoes/combat/swat //overpowered boots for death squads
name = "\improper SWAT boots"
desc = "High speed, no drag combat boots."
@@ -84,61 +67,6 @@
can_be_tied = FALSE
greyscale_icon_state = "boots"
-/obj/item/clothing/shoes/galoshes/dry
- name = "absorbent galoshes"
- desc = "A pair of orange rubber boots, designed to prevent slipping on wet surfaces while also drying them."
- icon_state = "galoshes_dry"
-
-/obj/item/clothing/shoes/galoshes/dry/step_action()
- var/turf/open/t_loc = get_turf(src)
- SEND_SIGNAL(t_loc, COMSIG_TURF_MAKE_DRY, TURF_WET_WATER, TRUE, INFINITY)
-
-/obj/item/clothing/shoes/clown_shoes
- desc = "The prankster's standard-issue clowning shoes. Damn, they're huge! Ctrl-click to toggle waddle dampeners."
- name = "clown shoes"
- icon_state = "clown"
- item_state = "clown_shoes"
- slowdown = SHOES_SLOWDOWN+1
- pocket_storage_component_path = /datum/component/storage/concrete/pockets/shoes/clown
- var/enabled_waddle = TRUE
- lace_time = 20 SECONDS // how the hell do these laces even work??
-
-/obj/item/clothing/shoes/clown_shoes/Initialize()
- . = ..()
- AddComponent(/datum/component/squeak, list('sound/effects/clownstep1.ogg'=1,'sound/effects/clownstep2.ogg'=1), 50, falloff_exponent = 20) //die off quick please)
-
-/obj/item/clothing/shoes/clown_shoes/equipped(mob/user, slot)
- . = ..()
- if(slot == ITEM_SLOT_FEET)
- if(enabled_waddle)
- user.AddElement(/datum/element/waddling)
- if(user.mind && user.mind.assigned_role == "Clown")
- SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "clownshoes", /datum/mood_event/clownshoes)
-
-/obj/item/clothing/shoes/clown_shoes/dropped(mob/user)
- . = ..()
- user.RemoveElement(/datum/element/waddling)
- if(user.mind && user.mind.assigned_role == "Clown")
- SEND_SIGNAL(user, COMSIG_CLEAR_MOOD_EVENT, "clownshoes")
-
-/obj/item/clothing/shoes/clown_shoes/CtrlClick(mob/living/user)
- if(!isliving(user))
- return
- if(user.get_active_held_item() != src)
- to_chat(user, "You must hold the [src] in your hand to do this!")
- return
- if (!enabled_waddle)
- to_chat(user, "You switch off the waddle dampeners!")
- enabled_waddle = TRUE
- else
- to_chat(user, "You switch on the waddle dampeners!")
- enabled_waddle = FALSE
-
-/obj/item/clothing/shoes/clown_shoes/jester
- name = "jester shoes"
- desc = "A court jester's shoes, updated with modern squeaking technology."
- icon_state = "jester_shoes"
-
/obj/item/clothing/shoes/jackboots
name = "jackboots"
desc = "Ankle-high combat boots for combat scenarios or combat situations. All combat, all the time."
@@ -198,36 +126,12 @@
icon_state = "explorer"
resistance_flags = FIRE_PROOF
-/obj/item/clothing/shoes/cyborg
- name = "cyborg boots"
- desc = "Shoes for a cyborg costume."
- icon_state = "boots"
-
/obj/item/clothing/shoes/laceup
name = "laceup shoes"
desc = "The height of fashion, and they're pre-polished!"
icon_state = "laceups"
equip_delay_other = 50
-/obj/item/clothing/shoes/roman
- name = "roman sandals"
- desc = "Sandals with buckled leather straps on it."
- icon_state = "roman"
- item_state = "roman"
- strip_delay = 100
- equip_delay_other = 100
- permeability_coefficient = 0.9
- can_be_tied = FALSE
-
-/obj/item/clothing/shoes/griffin
- name = "griffon boots"
- desc = "A pair of costume boots fashioned after bird talons."
- icon_state = "griffinboots"
- item_state = "griffinboots"
- pocket_storage_component_path = /datum/component/storage/concrete/pockets/shoes
- lace_time = 8 SECONDS
- greyscale_icon_state = "boots"
-
/obj/item/clothing/shoes/bhop
name = "jump boots"
desc = "The EXOCOM's Cortez launch boot line represents a specialized pair of mining boots with a built-in propulsion system, designed for rapid foward movement."
@@ -264,57 +168,6 @@
else
to_chat(user, "Something prevents you from dashing forward!")
-/obj/item/clothing/shoes/bronze
- name = "bronze boots"
- desc = "A giant, clunky pair of shoes crudely made out of bronze. Why would anyone wear these?"
- icon = 'icons/obj/clothing/clockwork_garb.dmi'
- icon_state = "clockwork_treads"
- lace_time = 8 SECONDS
- greyscale_icon_state = "boots"
-
-/obj/item/clothing/shoes/bronze/Initialize()
- . = ..()
- AddComponent(/datum/component/squeak, list('sound/machines/clockcult/integration_cog_install.ogg' = 1, 'sound/magic/clockwork/fellowship_armory.ogg' = 1), 50, extrarange = SHORT_RANGE_SOUND_EXTRARANGE)
-
-/obj/item/clothing/shoes/wheelys
- name = "Wheely-Heels"
- desc = "Uses patented retractable wheel technology. Never sacrifice speed for style - not that this provides much of either." //Thanks Fel
- icon_state = "wheelys"
- item_state = "wheelys"
- actions_types = list(/datum/action/item_action/wheelys)
- var/wheelToggle = FALSE //False means wheels are not popped out
- var/obj/vehicle/ridden/scooter/wheelys/W
-
-/obj/item/clothing/shoes/wheelys/Initialize()
- . = ..()
- W = new /obj/vehicle/ridden/scooter/wheelys(null)
-
-/obj/item/clothing/shoes/wheelys/ui_action_click(mob/user, action)
- if(!isliving(user))
- return
- if(!istype(user.get_item_by_slot(ITEM_SLOT_FEET), /obj/item/clothing/shoes/wheelys))
- to_chat(user, "You must be wearing the wheely-heels to use them!")
- return
- if(!(W.is_occupant(user)))
- wheelToggle = FALSE
- if(wheelToggle)
- W.unbuckle_mob(user)
- wheelToggle = FALSE
- return
- W.forceMove(get_turf(user))
- W.buckle_mob(user)
- wheelToggle = TRUE
-
-/obj/item/clothing/shoes/wheelys/dropped(mob/user)
- if(wheelToggle)
- W.unbuckle_mob(user)
- wheelToggle = FALSE
- ..()
-
-/obj/item/clothing/shoes/wheelys/Destroy()
- QDEL_NULL(W)
- . = ..()
-
/obj/item/clothing/shoes/kindleKicks
name = "Kindle Kicks"
desc = "They'll sure kindle something in you, and it's not childhood nostalgia..."
@@ -328,7 +181,6 @@
var/lightCycle = 0
var/active = FALSE
-
/obj/item/clothing/shoes/kindleKicks/ui_action_click(mob/user, action)
if(active)
return
@@ -410,21 +262,3 @@
desc = "A pair of authentic haute couture boots. You doubt they have ever been close to cattle."
icon_state = "cowboy_fancy"
permeability_coefficient = 0.08
-
-/obj/item/clothing/shoes/cookflops
- desc = "All this talk of antags, greytiding, and griefing... I just wanna grill for god's sake!"
- name = "grilling sandals"
- icon_state = "cookflops"
- can_be_tied = FALSE
-
-/obj/item/clothing/shoes/yakuza
- name = "tojo clan shoes"
- desc = "Steel-toed and intimidating."
- icon_state = "MajimaShoes"
- item_state = "MajimaShoes_worn"
-
-/obj/item/clothing/shoes/jackbros
- name = "frosty boots"
- desc = "For when you're stepping on up to the plate."
- icon_state = "JackFrostShoes"
- item_state = "JackFrostShoes_worn"
diff --git a/code/modules/clothing/suits/chaplainsuits.dm b/code/modules/clothing/suits/chaplainsuits.dm
index 073966a5fc15..30436045da2f 100644
--- a/code/modules/clothing/suits/chaplainsuits.dm
+++ b/code/modules/clothing/suits/chaplainsuits.dm
@@ -5,69 +5,3 @@
/obj/item/clothing/suit/hooded/chaplainsuit
allowed = list(/obj/item/storage/book/bible, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman)
-
-//Suits
-/obj/item/clothing/suit/chaplainsuit/holidaypriest
- name = "holiday priest"
- desc = "This is a nice holiday, my son."
- icon_state = "holidaypriest"
- item_state = "w_suit"
- body_parts_covered = CHEST|GROIN|LEGS|ARMS
- flags_inv = HIDEJUMPSUIT
-
-/obj/item/clothing/suit/chaplainsuit/nun
- name = "nun robe"
- desc = "Maximum piety in this star system."
- icon_state = "nun"
- item_state = "nun"
- body_parts_covered = CHEST|GROIN|LEGS|ARMS|HANDS
- flags_inv = HIDESHOES|HIDEJUMPSUIT
-
-/obj/item/clothing/suit/chaplainsuit/bishoprobe
- name = "bishop's robes"
- desc = "Glad to see the tithes you collected were well spent."
- icon_state = "bishoprobe"
- item_state = "bishoprobe"
- body_parts_covered = CHEST|GROIN|LEGS|ARMS
- flags_inv = HIDEJUMPSUIT
-
-/obj/item/clothing/suit/hooded/chaplainsuit/monkhabit
- name = "monk's habit"
- desc = "A few steps above rended sackcloth."
- icon_state = "monkfrock"
- item_state = "monkfrock"
- body_parts_covered = CHEST|GROIN|LEGS|ARMS
- hoodtype = /obj/item/clothing/head/hooded/monkhabit
-
-/obj/item/clothing/head/hooded/monkhabit
- name = "monk's hood"
- desc = "For when a man wants to cover up his tonsure."
- icon_state = "monkhood"
- item_state = "monkhood"
- body_parts_covered = HEAD
- flags_inv = HIDEHAIR|HIDEEARS
-
-/obj/item/clothing/suit/chaplainsuit/monkrobeeast
- name = "eastern monk's robes"
- desc = "Best combined with a shaved head."
- icon_state = "monkrobeeast"
- item_state = "monkrobeeast"
- body_parts_covered = GROIN|LEGS
- flags_inv = HIDEJUMPSUIT
-
-/obj/item/clothing/suit/chaplainsuit/whiterobe
- name = "white robe"
- desc = "Good for clerics and sleepy crewmembers."
- icon_state = "whiterobe"
- item_state = "whiterobe"
- body_parts_covered = CHEST|GROIN|LEGS|ARMS
- flags_inv = HIDEJUMPSUIT
-
-/obj/item/clothing/suit/chaplainsuit/clownpriest
- name = "Robes of the Honkmother"
- desc = "Meant for a clown of the cloth."
- icon_state = "clownpriest"
- item_state = "clownpriest"
- body_parts_covered = CHEST|GROIN|LEGS|ARMS
- flags_inv = HIDEJUMPSUIT
- allowed = list(/obj/item/megaphone/clown, /obj/item/soap, /obj/item/reagent_containers/food/snacks/pie/cream, /obj/item/bikehorn, /obj/item/bikehorn/golden, /obj/item/bikehorn/airhorn, /obj/item/instrument/bikehorn, /obj/item/reagent_containers/food/drinks/soda_cans/canned_laughter, /obj/item/toy/crayon, /obj/item/toy/crayon/spraycan, /obj/item/toy/crayon/spraycan/lubecan, /obj/item/grown/bananapeel, /obj/item/reagent_containers/food/snacks/grown/banana)
diff --git a/code/modules/clothing/suits/cloaks.dm b/code/modules/clothing/suits/cloaks.dm
index 763be0e2f468..982b3804f586 100644
--- a/code/modules/clothing/suits/cloaks.dm
+++ b/code/modules/clothing/suits/cloaks.dm
@@ -180,19 +180,3 @@
resistance_flags = NONE
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
flags_cover = HEADCOVERSEYES
-
-/obj/item/clothing/suit/hooded/cloak/goliath/polar
- name = "polar cloak"
- icon_state = "polarcloak"
- hoodtype = /obj/item/clothing/head/hooded/cloakhood/goliath/polar
- desc = "A tribal hood made from a polar bears pelt. Keeps it's wearer warm and looks badass while doing it."
- min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
- cold_protection = CHEST|GROIN|LEGS|FEET|ARMS
-
-/obj/item/clothing/head/hooded/cloakhood/goliath/polar
- name = "polar cloak"
- icon_state = "hoodie_gray"
- mob_overlay_state = "polhood"
- desc = "Wear bear on head show little man you big man, kill bear for cloak."
- min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
- cold_protection = HEAD
diff --git a/code/modules/clothing/suits/hoodies.dm b/code/modules/clothing/suits/hoodies.dm
index b69061cffbd1..e1507af5c229 100644
--- a/code/modules/clothing/suits/hoodies.dm
+++ b/code/modules/clothing/suits/hoodies.dm
@@ -1,6 +1,7 @@
/obj/item/clothing/suit/hooded/hoodie
name = "hoodie"
desc = "HOW"
+ icon_state = null
hoodtype = /obj/item/clothing/head/hooded/hood
body_parts_covered = CHEST|ARMS
pocket_storage_component_path = /datum/component/storage/concrete/pockets/exo/large
@@ -19,6 +20,9 @@
/obj/item/clothing/head/hooded/hood
name = "hood"
desc = "HOW"
+ icon_state = null
+ icon = 'icons/obj/clothing/head/winterhood.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/head/winterhood.dmi'
body_parts_covered = HEAD
flags_inv = HIDEHAIR|HIDEEARS
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0) //it's just a hoodie.
diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm
index 3b1735208dda..2b06e695851c 100644
--- a/code/modules/clothing/suits/jobs.dm
+++ b/code/modules/clothing/suits/jobs.dm
@@ -270,24 +270,6 @@
icon_state = "coat_terragov"
item_state = "coat_terragov"
-/obj/item/clothing/suit/hooded/enginseer
- name = "enginseer regalia"
- desc = "You hold the secrets of the Machine."
- icon_state = "enginseer"
- item_state = "enginseer"
- hoodtype = /obj/item/clothing/head/hooded/enginseer
- body_parts_covered = CHEST|GROIN|LEGS|ARMS|HANDS
- flags_inv = HIDESHOES|HIDEJUMPSUIT|HIDEGLOVES
- allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/gun, /obj/item/melee, /obj/item/radio, /obj/item/storage/book)
-
-/obj/item/clothing/head/hooded/enginseer
- name = "enginseer's hood"
- desc = "You are honored that they require your skills."
- icon_state = "enginseerhood"
- item_state = "enginseerhood"
- body_parts_covered = HEAD
- flags_inv = HIDEHAIR|HIDEEARS|HIDEFACE|HIDEFACIALHAIR
-
/obj/item/clothing/suit/armor/witchhunter
name = "witchunter garb"
desc = "This worn outfit saw much use back in the day."
diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm
index 6e8b87b06285..c8e54edb2e01 100644
--- a/code/modules/clothing/suits/miscellaneous.dm
+++ b/code/modules/clothing/suits/miscellaneous.dm
@@ -31,20 +31,6 @@
/*
* Costume
*/
-/obj/item/clothing/suit/hooded/flashsuit
- name = "flashy costume"
- desc = "What did you expect?"
- icon_state = "flashsuit"
- item_state = "armor"
- body_parts_covered = CHEST|GROIN
- hoodtype = /obj/item/clothing/head/hooded/flashsuit
-
-/obj/item/clothing/head/hooded/flashsuit
- name = "flash button"
- desc = "You will learn to fear the flash."
- icon_state = "flashsuit"
- body_parts_covered = HEAD
- flags_inv = HIDEHAIR|HIDEEARS|HIDEFACIALHAIR|HIDEFACE|HIDEMASK
/obj/item/clothing/suit/pirate
name = "pirate coat"
@@ -59,27 +45,6 @@
icon_state = "hgpirate"
item_state = "hgpirate"
-
-/obj/item/clothing/suit/cyborg_suit
- name = "cyborg suit"
- desc = "Suit for a cyborg costume."
- icon_state = "death"
- item_state = "death"
- mob_overlay_state = "cardborg"
- flags_1 = CONDUCT_1
- fire_resist = T0C+5200
- flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
-
-
-/obj/item/clothing/suit/justice
- name = "justice suit"
- desc = "this pretty much looks ridiculous" //Needs no fixing
- icon_state = "justice"
- item_state = "justice"
- flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
- armor = list("melee" = 35, "bullet" = 30, "laser" = 30, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
-
-
/obj/item/clothing/suit/judgerobe
name = "judge's robe"
desc = "This robe commands authority."
@@ -116,42 +81,6 @@
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
resistance_flags = NONE
-/obj/item/clothing/suit/hastur
- name = "\improper Hastur's robe"
- desc = "Robes not meant to be worn by man."
- icon_state = "hastur"
- item_state = "hastur"
- body_parts_covered = CHEST|GROIN|LEGS|ARMS
- flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
-
-
-/obj/item/clothing/suit/imperium_monk
- name = "\improper Imperium monk suit"
- desc = "Have YOU killed a xeno today?"
- icon_state = "imperium_monk"
- item_state = "imperium_monk"
- body_parts_covered = CHEST|GROIN|LEGS|ARMS
- flags_inv = HIDESHOES|HIDEJUMPSUIT
- allowed = list(/obj/item/storage/book/bible, /obj/item/melee/sword, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen)
-
-
-/obj/item/clothing/suit/chickensuit
- name = "chicken suit"
- desc = "A suit made long ago by the ancient empire KFC."
- icon_state = "chickensuit"
- item_state = "chickensuit"
- body_parts_covered = CHEST|ARMS|GROIN|LEGS|FEET
- flags_inv = HIDESHOES|HIDEJUMPSUIT
-
-
-/obj/item/clothing/suit/monkeysuit
- name = "monkey suit"
- desc = "A suit that looks like a primate."
- icon_state = "monkeysuit"
- item_state = "monkeysuit"
- body_parts_covered = CHEST|ARMS|GROIN|LEGS|FEET|HANDS
- flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
-
/obj/item/clothing/suit/toggle/owlwings
name = "owl cloak"
desc = "A soft brown cloak made of synthetic feathers. Soft to the touch, stylish, and a 2 meter wing span that will drive the ladies mad."
@@ -208,42 +137,6 @@
body_parts_covered = CHEST|GROIN
flags_inv = HIDEJUMPSUIT
-/obj/item/clothing/suit/poncho
- name = "poncho"
- desc = "Your classic, non-racist poncho."
- icon_state = "classicponcho"
- item_state = "classicponcho"
-
-/obj/item/clothing/suit/poncho/green
- name = "green poncho"
- desc = "Your classic, non-racist poncho. This one is green."
- icon_state = "greenponcho"
- item_state = "greenponcho"
-
-/obj/item/clothing/suit/poncho/red
- name = "red poncho"
- desc = "Your classic, non-racist poncho. This one is red."
- icon_state = "redponcho"
- item_state = "redponcho"
-
-/obj/item/clothing/suit/poncho/ponchoshame
- name = "poncho of shame"
- desc = "Forced to live on your shameful acting as a fake Mexican, you and your poncho have grown inseparable. Literally."
- icon_state = "ponchoshame"
- item_state = "ponchoshame"
-
-/obj/item/clothing/suit/poncho/ponchoshame/Initialize()
- . = ..()
- ADD_TRAIT(src, TRAIT_NODROP, SHAMEBRERO_TRAIT)
-
-/obj/item/clothing/suit/whitedress
- name = "white dress"
- desc = "A fancy white dress."
- icon_state = "white_dress"
- item_state = "w_suit"
- body_parts_covered = CHEST|GROIN|LEGS|FEET
- flags_inv = HIDEJUMPSUIT|HIDESHOES
-
/obj/item/clothing/suit/hooded/carp_costume
name = "carp costume"
desc = "A costume made from 'synthetic' carp scales, it smells."
@@ -274,44 +167,6 @@
if (user.head == src)
user.faction -= "carp"
-/obj/item/clothing/suit/hooded/ian_costume //It's Ian, rub his bell- oh god what happened to his inside parts?
- name = "corgi costume"
- desc = "A costume that looks like someone made a human-like corgi, it won't guarantee belly rubs."
- icon_state = "ian"
- item_state = "labcoat"
- body_parts_covered = CHEST|GROIN|ARMS
- //cold_protection = CHEST|GROIN|ARMS
- //min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
- allowed = list()
- hoodtype = /obj/item/clothing/head/hooded/ian_hood
- dog_fashion = /datum/dog_fashion/back
-
-/obj/item/clothing/head/hooded/ian_hood
- name = "corgi hood"
- desc = "A hood that looks just like a corgi's head, it won't guarantee dog biscuits."
- icon_state = "ian"
- body_parts_covered = HEAD
- //cold_protection = HEAD
- //min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
- flags_inv = HIDEHAIR|HIDEEARS
-
-/obj/item/clothing/suit/hooded/bee_costume // It's Hip!
- name = "bee costume"
- desc = "Bee the true Queen!"
- icon_state = "bee"
- item_state = "labcoat"
- body_parts_covered = CHEST|GROIN|ARMS
- clothing_flags = THICKMATERIAL
- hoodtype = /obj/item/clothing/head/hooded/bee_hood
-
-/obj/item/clothing/head/hooded/bee_hood
- name = "bee hood"
- desc = "A hood attached to a bee costume."
- icon_state = "bee"
- body_parts_covered = HEAD
- clothing_flags = THICKMATERIAL
- flags_inv = HIDEHAIR|HIDEEARS
-
/obj/item/clothing/suit/hooded/bloated_human //OH MY GOD WHAT HAVE YOU DONE!?!?!?
name = "bloated human suit"
desc = "A horribly bloated suit made from human skins."
@@ -333,14 +188,6 @@
flags_cover = HEADCOVERSEYES
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
-/obj/item/clothing/suit/shrine_maiden
- name = "shrine maiden's outfit"
- desc = "Makes you want to exterminate some troublesome youkai."
- icon_state = "shrine_maiden"
- item_state = "shrine_maiden"
- body_parts_covered = CHEST|GROIN|LEGS|ARMS
- flags_inv = HIDEJUMPSUIT
-
/*
* Misc
*/
@@ -378,18 +225,6 @@
icon_state = "nerdshirt"
item_state = "nerdshirt"
-/obj/item/clothing/suit/vapeshirt //wearing this is asking to get beat.
- name = "Vape Naysh shirt"
- desc = "A cheap white T-shirt with a big tacky \"VN\" on the front, Why would you wear this unironically?"
- icon_state = "vapeshirt"
- item_state = "vapeshirt"
-
-/obj/item/clothing/suit/striped_sweater
- name = "striped sweater"
- desc = "Reminds you of someone, but you just can't put your finger on it..."
- icon_state = "waldo_shirt"
- item_state = "waldo_shirt"
-
/obj/item/clothing/suit/jacket
name = "bomber jacket"
desc = "Aviators not included."
@@ -409,13 +244,6 @@
max_heat_protection_temperature = ARMOR_MAX_TEMP_PROTECT
allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/gun/ballistic/automatic/pistol, /obj/item/gun/ballistic/revolver, /obj/item/gun/ballistic/revolver/detective, /obj/item/radio)
-/obj/item/clothing/suit/jacket/leather/overcoat
- name = "leather overcoat"
- desc = "That's a damn fine coat."
- icon_state = "leathercoat"
- body_parts_covered = CHEST|GROIN|ARMS|LEGS
- cold_protection = CHEST|GROIN|ARMS|LEGS
-
/obj/item/clothing/suit/jacket/leather/duster
name = "leather duster"
desc = "A long, utilitarian leather coat. Ideal for protecting its wearer from rain, sun, and dust."
@@ -478,40 +306,12 @@
icon_state = "letterman_n"
item_state = "letterman_n"
-/obj/item/clothing/suit/dracula
- name = "dracula coat"
- desc = "Looks like this belongs in a very old movie set."
- icon_state = "draculacoat"
- item_state = "draculacoat"
-
-/obj/item/clothing/suit/drfreeze_coat
- name = "doctor freeze's labcoat"
- desc = "A labcoat imbued with the power of features and freezes."
- icon_state = "drfreeze_coat"
- item_state = "drfreeze_coat"
-
/obj/item/clothing/suit/gothcoat
name = "gothic coat"
desc = "Perfect for those who want to stalk around a corner of a bar."
icon_state = "gothcoat"
item_state = "gothcoat"
-/obj/item/clothing/suit/xenos
- name = "xenos suit"
- desc = "A suit made out of chitinous alien hide."
- icon_state = "xenos"
- item_state = "xenos_helm"
- body_parts_covered = CHEST|GROIN|LEGS|ARMS|HANDS
- flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
- allowed = list(/mob/living/simple_animal/hostile/facehugger/toy)
-
-/obj/item/clothing/suit/nemes
- name = "pharoah tunic"
- desc = "Lavish space tomb not included."
- icon_state = "pharoah"
- item_state = "pharoah"
- body_parts_covered = CHEST|GROIN
-
/obj/item/clothing/suit/caution
name = "wet floor sign"
desc = "No running."
@@ -528,34 +328,6 @@
attack_verb = list("warned", "cautioned", "smashed")
armor = list("melee" = 5, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
-/obj/item/clothing/suit/changshan_red
- name = "red changshan"
- desc = "A gorgeously embroidered silk shirt."
- icon_state = "changshan_red"
- item_state = "changshan_red"
- body_parts_covered = CHEST|GROIN|ARMS|LEGS
-
-/obj/item/clothing/suit/changshan_blue
- name = "blue changshan"
- desc = "A gorgeously embroidered silk shirt."
- icon_state = "changshan_blue"
- item_state = "changshan_blue"
- body_parts_covered = CHEST|GROIN|ARMS|LEGS
-
-/obj/item/clothing/suit/cheongsam_red
- name = "red cheongsam"
- desc = "A gorgeously embroidered silk dress."
- icon_state = "cheongsam_red"
- item_state = "cheongsam_red"
- body_parts_covered = CHEST|GROIN|ARMS|LEGS
-
-/obj/item/clothing/suit/cheongsam_blue
- name = "blue cheongsam"
- desc = "A gorgeously embroidered silk dress."
- icon_state = "cheongsam_blue"
- item_state = "cheongsam_blue"
- body_parts_covered = CHEST|GROIN|ARMS|LEGS
-
/obj/item/clothing/head/hooded/ablative
name = "ablative hood"
desc = "Hood hopefully belonging to an ablative trenchcoat. Includes a visor for cool-o-vision."
@@ -606,20 +378,6 @@
if (prob(hit_reflect_chance))
return TRUE
-/obj/item/clothing/suit/spookyghost
- name = "spooky ghost"
- desc = "This is obviously just a bedsheet, but maybe try it on?"
- icon_state = "bedsheet"
- user_vars_to_edit = list("name" = "Spooky Ghost", "real_name" = "Spooky Ghost" , "incorporeal_move" = INCORPOREAL_MOVE_BASIC, "appearance_flags" = KEEP_TOGETHER|TILE_BOUND, "alpha" = 150)
- alternate_worn_layer = ABOVE_BODY_FRONT_LAYER //so the bedsheet goes over everything but fire
-
-/obj/item/clothing/suit/bronze
- name = "bronze suit"
- desc = "A big and clanky suit made of bronze that offers no protection and looks very unfashionable. Nice."
- icon = 'icons/obj/clothing/clockwork_garb.dmi'
- icon_state = "clockwork_cuirass_old"
- armor = list("melee" = 5, "bullet" = 0, "laser" = -5, "energy" = -15, "bomb" = 10, "bio" = 0, "rad" = 0, "fire" = 20, "acid" = 20)
-
/obj/item/clothing/suit/ghost_sheet
name = "ghost sheet"
desc = "The hands float by themselves, so it's extra spooky."
@@ -644,40 +402,8 @@
icon = 'icons/obj/clothing/belts.dmi'
icon_state = "suspenders_gray"
-/obj/item/clothing/suit/hooded/mysticrobe
- name = "mystic's robe"
- desc = "Wearing this makes you feel more attuned with the nature of the universe... as well as a bit more irresponsible. "
- icon_state = "mysticrobe"
- item_state = "mysticrobe"
- body_parts_covered = CHEST|GROIN|LEGS|ARMS
- allowed = list(/obj/item/spellbook, /obj/item/storage/book/bible)
- flags_inv = HIDEJUMPSUIT
- hoodtype = /obj/item/clothing/head/hooded/mysticrobe
-
-/obj/item/clothing/head/hooded/mysticrobe
- name = "mystic's hood"
- desc = "The balance of reality tips towards order."
- icon_state = "mystichood"
- item_state = "mystichood"
- body_parts_covered = HEAD
- flags_inv = HIDEHAIR|HIDEEARS|HIDEFACIALHAIR|HIDEFACE|HIDEMASK
-
/obj/item/clothing/suit/hawaiian
name = "floral shirt"
desc = "From grills to guns, this shirt's seen it all."
icon_state = "hawaiian_blue"
item_state = "hawaiian_blue"
-
-/obj/item/clothing/suit/yakuza
- name = "tojo clan jacket"
- desc = "The jacket of a mad dog."
- icon_state = "MajimaJacket"
- item_state = "MajimaJacket"
- body_parts_covered = ARMS
-
-/obj/item/clothing/suit/dutch
- name = "dutch's jacket"
- desc = "For those long nights on the beach in Tahiti."
- icon_state = "DutchJacket"
- item_state = "DutchJacket"
- body_parts_covered = ARMS
diff --git a/code/modules/clothing/suits/wiz_robe.dm b/code/modules/clothing/suits/wiz_robe.dm
index 451d428760f3..e0d7f1c7e124 100644
--- a/code/modules/clothing/suits/wiz_robe.dm
+++ b/code/modules/clothing/suits/wiz_robe.dm
@@ -11,47 +11,6 @@
resistance_flags = FIRE_PROOF | ACID_PROOF
dog_fashion = /datum/dog_fashion/head/blue_wizard
-/obj/item/clothing/head/wizard/red
- name = "red wizard hat"
- desc = "Strange-looking red hat-wear that most certainly belongs to a real magic user."
- icon_state = "redwizard"
- dog_fashion = /datum/dog_fashion/head/red_wizard
-
-/obj/item/clothing/head/wizard/yellow
- name = "yellow wizard hat"
- desc = "Strange-looking yellow hat-wear that most certainly belongs to a powerful magic user."
- icon_state = "yellowwizard"
- dog_fashion = null
-
-/obj/item/clothing/head/wizard/black
- name = "black wizard hat"
- desc = "Strange-looking black hat-wear that most certainly belongs to a real skeleton. Spooky."
- icon_state = "blackwizard"
- dog_fashion = null
-
-/obj/item/clothing/head/wizard/fake
- name = "wizard hat"
- desc = "It has WIZZARD written across it in sequins. Comes with a cool beard."
- icon_state = "wizard-fake"
- gas_transfer_coefficient = 1
- permeability_coefficient = 1
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
- resistance_flags = FLAMMABLE
- dog_fashion = /datum/dog_fashion/head/blue_wizard
-
-/obj/item/clothing/head/wizard/marisa
- name = "witch hat"
- desc = "Strange-looking hat-wear. Makes you want to cast fireballs."
- icon_state = "marisa"
- dog_fashion = null
-
-/obj/item/clothing/head/wizard/magus
- name = "\improper Magus helm"
- desc = "A mysterious helmet that hums with an unearthly power."
- icon_state = "magus"
- item_state = "magus"
- dog_fashion = null
-
/obj/item/clothing/head/wizard/santa
name = "Santa's hat"
desc = "Ho ho ho. Merrry X-mas!"
@@ -76,78 +35,12 @@
equip_delay_other = 50
resistance_flags = FIRE_PROOF | ACID_PROOF
-/obj/item/clothing/suit/wizrobe/red
- name = "red wizard robe"
- desc = "A magnificent red gem-lined robe that seems to radiate power."
- icon_state = "redwizard"
- item_state = "redwizrobe"
-
-/obj/item/clothing/suit/wizrobe/yellow
- name = "yellow wizard robe"
- desc = "A magnificent yellow gem-lined robe that seems to radiate power."
- icon_state = "yellowwizard"
- item_state = "yellowwizrobe"
-
-/obj/item/clothing/suit/wizrobe/black
- name = "black wizard robe"
- desc = "An unnerving black gem-lined robe that reeks of death and decay."
- icon_state = "blackwizard"
- item_state = "blackwizrobe"
-
-/obj/item/clothing/suit/wizrobe/marisa
- name = "witch robe"
- desc = "Magic is all about the spell power, ZE!"
- icon_state = "marisa"
- item_state = "marisarobe"
-
-/obj/item/clothing/suit/wizrobe/magusblue
- name = "\improper Magus robe"
- desc = "A set of armored robes that seem to radiate a dark power."
- icon_state = "magusblue"
- item_state = "magusblue"
-
-/obj/item/clothing/suit/wizrobe/magusred
- name = "\improper Magus robe"
- desc = "A set of armored robes that seem to radiate a dark power."
- icon_state = "magusred"
- item_state = "magusred"
-
-
/obj/item/clothing/suit/wizrobe/santa
name = "Santa's suit"
desc = "Festive!"
icon_state = "santa"
item_state = "santa"
-/obj/item/clothing/suit/wizrobe/fake
- name = "wizard robe"
- desc = "A rather dull blue robe meant to mimic real wizard robes."
- icon_state = "wizard-fake"
- item_state = "wizrobe"
- gas_transfer_coefficient = 1
- permeability_coefficient = 1
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
- resistance_flags = FLAMMABLE
-
-/obj/item/clothing/head/wizard/marisa/fake
- name = "witch hat"
- desc = "Strange-looking hat-wear, makes you want to cast fireballs."
- icon_state = "marisa"
- gas_transfer_coefficient = 1
- permeability_coefficient = 1
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
- resistance_flags = FLAMMABLE
-
-/obj/item/clothing/suit/wizrobe/marisa/fake
- name = "witch robe"
- desc = "Magic is all about the spell power, ZE!"
- icon_state = "marisa"
- item_state = "marisarobe"
- gas_transfer_coefficient = 1
- permeability_coefficient = 1
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
- resistance_flags = FLAMMABLE
-
/obj/item/clothing/suit/space/hardsuit/shielded/wizard
name = "battlemage armour"
desc = "Not all wizards are afraid of getting up close and personal."
diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm
index 69c15b1e3494..8f8e532577c0 100644
--- a/code/modules/flufftext/Hallucination.dm
+++ b/code/modules/flufftext/Hallucination.dm
@@ -29,7 +29,7 @@ GLOBAL_LIST_INIT(hallucination_list, list(
if(!hallucination)
return
- hallucination--
+ hallucination = max(hallucination - 1, 0)
if(world.time < next_hallucination)
return
diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm
index 49de009448f2..0aa4ac7fad38 100644
--- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm
+++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm
@@ -479,7 +479,13 @@
break
if(firestarter && active)
hit_atom.fire_act()
- new /obj/effect/hotspot(get_turf(hit_atom))
+ var/turf/T = get_turf(hit_atom)
+ T.IgniteTurf(30)
+ var/turf/otherT
+ for(var/direction in GLOB.cardinals)
+ otherT = get_step(T, direction)
+ otherT.IgniteTurf(30)
+ new /obj/effect/hotspot(otherT)
..()
/obj/item/reagent_containers/food/drinks/bottle/molotov/attackby(obj/item/I, mob/user, params)
diff --git a/code/modules/food_and_drinks/food/condiment.dm b/code/modules/food_and_drinks/food/condiment.dm
index 0adf98ba5666..bd24a21d1a16 100644
--- a/code/modules/food_and_drinks/food/condiment.dm
+++ b/code/modules/food_and_drinks/food/condiment.dm
@@ -5,7 +5,7 @@
// to mixed-drinks code. If you want an object that starts pre-loaded, you need to make it in addition to the other code.
//Food items that aren't eaten normally and leave an empty container behind.
-/obj/item/reagent_containers/food/condiment
+/obj/item/reagent_containers/condiment
name = "condiment bottle"
desc = "Just your average condiment bottle."
icon = 'icons/obj/food/containers.dmi'
@@ -36,23 +36,25 @@
var/icon_empty = ""
fill_icon_thresholds = list(0, 10, 25, 50, 75, 100)
-/obj/item/reagent_containers/food/condiment/Initialize()
+/obj/item/reagent_containers/condiment/Initialize()
. = ..()
possible_states = typelist("possible_states", possible_states)
update_appearance()
-/obj/item/reagent_containers/food/condiment/update_icon()
+/obj/item/reagent_containers/condiment/update_icon()
cut_overlays()
if(reagents.reagent_list.len > 0 && possible_states.len)
- var/main_reagent = reagents.get_master_reagent_id()
- if(main_reagent in possible_states)
- icon_state = possible_states[main_reagent]["icon_state"]
- item_state = possible_states[main_reagent]["item_state"]
- icon_empty = possible_states[main_reagent]["icon_empty"]
- name = possible_states[main_reagent]["name"]
- desc = possible_states[main_reagent]["desc"]
+
+ var/datum/reagent/main_reagent_ref = reagents.get_master_reagent()
+ var/main_reagent_id = main_reagent_ref.type
+ if(main_reagent_id in possible_states)
+ icon_state = possible_states[main_reagent_id]["icon_state"]
+ item_state = possible_states[main_reagent_id]["item_state"]
+ icon_empty = possible_states[main_reagent_id]["icon_empty"]
+ name = possible_states[main_reagent_id]["name"]
+ desc = possible_states[main_reagent_id]["desc"]
return ..(TRUE) // Don't fill normally
else
name = "condiment bottle"
@@ -64,7 +66,7 @@
. = ..()
-/obj/item/reagent_containers/food/condiment/attack(mob/M, mob/user, def_zone)
+/obj/item/reagent_containers/condiment/attack(mob/M, mob/user, def_zone)
if(!reagents || !reagents.total_volume)
to_chat(user, "None of [src] left, oh no!")
@@ -90,7 +92,7 @@
playsound(M.loc,'sound/items/drink.ogg', rand(10,50), TRUE)
return 1
-/obj/item/reagent_containers/food/condiment/afterattack(obj/target, mob/user , proximity)
+/obj/item/reagent_containers/condiment/afterattack(obj/target, mob/user , proximity)
. = ..()
if(!proximity)
return
@@ -119,23 +121,23 @@
to_chat(user, "You transfer [trans] units of the condiment to [target].")
playsound(src, 'sound/items/glass_transfer.ogg', 50, 1)
-/obj/item/reagent_containers/food/condiment/on_reagent_change(changetype)
+/obj/item/reagent_containers/condiment/on_reagent_change(changetype)
update_appearance()
-/obj/item/reagent_containers/food/condiment/enzyme
+/obj/item/reagent_containers/condiment/enzyme
name = "universal enzyme"
desc = "Used in cooking various dishes."
icon_state = "enzyme"
list_reagents = list(/datum/reagent/consumable/enzyme = 50)
-/obj/item/reagent_containers/food/condiment/sugar
+/obj/item/reagent_containers/condiment/sugar
name = "sugar sack"
desc = "Tasty spacey sugar!"
icon_state = "sugar"
item_state = "flour"
list_reagents = list(/datum/reagent/consumable/sugar = 50)
-/obj/item/reagent_containers/food/condiment/saltshaker //Separate from above since it's a small shaker rather then
+/obj/item/reagent_containers/condiment/saltshaker //Separate from above since it's a small shaker rather then
name = "salt shaker" // a large one.
desc = "Salt. From space oceans, presumably."
icon_state = "saltshakersmall"
@@ -145,7 +147,7 @@
volume = 20
list_reagents = list(/datum/reagent/consumable/sodiumchloride = 20)
-/obj/item/reagent_containers/food/condiment/saltshaker/afterattack(obj/target, mob/living/user, proximity)
+/obj/item/reagent_containers/condiment/saltshaker/afterattack(obj/target, mob/living/user, proximity)
. = ..()
if(!proximity)
return
@@ -158,7 +160,7 @@
new/obj/effect/decal/cleanable/food/salt(target)
return
-/obj/item/reagent_containers/food/condiment/peppermill
+/obj/item/reagent_containers/condiment/peppermill
name = "pepper mill"
desc = "Often used to flavor food or make people sneeze."
icon_state = "peppermillsmall"
@@ -168,7 +170,7 @@
volume = 20
list_reagents = list(/datum/reagent/consumable/blackpepper = 20)
-/obj/item/reagent_containers/food/condiment/milk
+/obj/item/reagent_containers/condiment/milk
name = "space milk"
desc = "It's milk. White and nutritious goodness!"
icon_state = "milk"
@@ -177,14 +179,14 @@
righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi'
list_reagents = list(/datum/reagent/consumable/milk = 50)
-/obj/item/reagent_containers/food/condiment/flour
+/obj/item/reagent_containers/condiment/flour
name = "flour sack"
desc = "A big bag of flour. Good for baking!"
icon_state = "flour"
item_state = "flour"
list_reagents = list(/datum/reagent/consumable/flour = 30)
-/obj/item/reagent_containers/food/condiment/soymilk
+/obj/item/reagent_containers/condiment/soymilk
name = "soy milk"
desc = "It's soy milk. White and nutritious goodness!"
icon_state = "soymilk"
@@ -193,20 +195,20 @@
righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi'
list_reagents = list(/datum/reagent/consumable/soymilk = 50)
-/obj/item/reagent_containers/food/condiment/rice
+/obj/item/reagent_containers/condiment/rice
name = "rice sack"
desc = "A big bag of rice. Good for cooking!"
icon_state = "rice"
item_state = "flour"
list_reagents = list(/datum/reagent/consumable/rice = 30)
-/obj/item/reagent_containers/food/condiment/soysauce
+/obj/item/reagent_containers/condiment/soysauce
name = "soy sauce"
desc = "A salty soy-based flavoring."
icon_state = "soysauce"
list_reagents = list(/datum/reagent/consumable/soysauce = 50)
-/obj/item/reagent_containers/food/condiment/mayonnaise
+/obj/item/reagent_containers/condiment/mayonnaise
name = "mayonnaise"
desc = "An oily condiment made from egg yolks."
icon_state = "mayonnaise"
@@ -214,7 +216,7 @@
//Food packs. To easily apply deadly toxi... delicious sauces to your food!
-/obj/item/reagent_containers/food/condiment/pack
+/obj/item/reagent_containers/condiment/pack
name = "condiment pack"
desc = "A small plastic pack with condiments to put on your food."
icon_state = "condi_empty"
@@ -234,14 +236,19 @@
/datum/reagent/consumable/bbqsauce = list("condi_bbq", "BBQ sauce", "Hand wipes not included."),
)
-/obj/item/reagent_containers/food/condiment/pack/update_icon()
+/obj/item/reagent_containers/condiment/pack/create_reagents(max_vol, flags)
+ . = ..()
+ RegisterSignals(reagents, list(COMSIG_REAGENTS_NEW_REAGENT, COMSIG_REAGENTS_ADD_REAGENT, COMSIG_REAGENTS_REM_REAGENT), PROC_REF(on_reagent_add), TRUE)
+ RegisterSignal(reagents, COMSIG_REAGENTS_DEL_REAGENT, PROC_REF(on_reagent_del), TRUE)
+
+/obj/item/reagent_containers/condiment/pack/update_icon()
SHOULD_CALL_PARENT(FALSE)
- return ..()
+ return
-/obj/item/reagent_containers/food/condiment/pack/attack(mob/M, mob/user, def_zone) //Can't feed these to people directly.
+/obj/item/reagent_containers/condiment/pack/attack(mob/M, mob/user, def_zone) //Can't feed these to people directly.
return
-/obj/item/reagent_containers/food/condiment/pack/afterattack(obj/target, mob/user , proximity)
+/obj/item/reagent_containers/condiment/pack/afterattack(obj/target, mob/user , proximity)
. = ..()
if(!proximity)
return
@@ -257,67 +264,74 @@
src.reagents.trans_to(target, amount_per_transfer_from_this, transfered_by = user)
qdel(src)
-/obj/item/reagent_containers/food/condiment/pack/on_reagent_change(changetype)
- if(reagents.reagent_list.len > 0)
- var/main_reagent = reagents.get_master_reagent_id()
- if(main_reagent in possible_states)
- var/list/temp_list = possible_states[main_reagent]
- icon_state = temp_list[1]
- desc = temp_list[3]
- else
- icon_state = "condi_mixed"
- desc = "A small condiment pack. The label says it contains [originalname]"
+/// Handles reagents getting added to the condiment pack.
+/obj/item/reagent_containers/condiment/pack/proc/on_reagent_add(datum/reagents/reagents)
+ SIGNAL_HANDLER
+
+ var/datum/reagent/main_reagent = reagents.get_master_reagent()
+
+ var/main_reagent_type = main_reagent?.type
+ if(main_reagent_type in possible_states)
+ var/list/temp_list = possible_states[main_reagent_type]
+ icon_state = temp_list[1]
+ desc = temp_list[3]
else
- icon_state = "condi_empty"
- desc = "A small condiment pack. It is empty."
+ icon_state = "condi_mixed"
+ desc = "A small condiment pack. The label says it contains [originalname]"
+
+/// Handles reagents getting removed from the condiment pack.
+/obj/item/reagent_containers/condiment/pack/proc/on_reagent_del(datum/reagents/reagents)
+ SIGNAL_HANDLER
+ icon_state = "condi_empty"
+ desc = "A small condiment pack. It is empty."
//Ketchup
-/obj/item/reagent_containers/food/condiment/pack/ketchup
+/obj/item/reagent_containers/condiment/pack/ketchup
name = "ketchup pack"
originalname = "ketchup"
list_reagents = list(/datum/reagent/consumable/ketchup = 10)
//Hot sauce
-/obj/item/reagent_containers/food/condiment/pack/hotsauce
+/obj/item/reagent_containers/condiment/pack/hotsauce
name = "hotsauce pack"
originalname = "hotsauce"
list_reagents = list(/datum/reagent/consumable/capsaicin = 10)
-/obj/item/reagent_containers/food/condiment/pack/astrotame
+/obj/item/reagent_containers/condiment/pack/astrotame
name = "astrotame pack"
originalname = "astrotame"
list_reagents = list(/datum/reagent/consumable/astrotame = 5)
-/obj/item/reagent_containers/food/condiment/pack/bbqsauce
+/obj/item/reagent_containers/condiment/pack/bbqsauce
name = "bbq sauce pack"
originalname = "bbq sauce"
list_reagents = list(/datum/reagent/consumable/bbqsauce = 10)
-/obj/item/reagent_containers/food/condiment/ketchup
+/obj/item/reagent_containers/condiment/ketchup
name = "ketchup bottle"
desc = "You feel more american already"
icon_state = "ketchup"
list_reagents = list(/datum/reagent/consumable/ketchup = 50)
-/obj/item/reagent_containers/food/condiment/bbqsauce
+/obj/item/reagent_containers/condiment/bbqsauce
name = "bbq sauce bottle"
desc = "Hand wipes not included"
icon_state = "bbqsauce"
list_reagents = list(/datum/reagent/consumable/bbqsauce = 50)
-/obj/item/reagent_containers/food/condiment/hotsauce
+/obj/item/reagent_containers/condiment/hotsauce
name = "hot sauce bottle"
desc = "You can almost TASTE the stomach ulcers now!"
icon_state = "hotsauce"
list_reagents = list(/datum/reagent/consumable/capsaicin = 50)
-/obj/item/reagent_containers/food/condiment/coldsauce
+/obj/item/reagent_containers/condiment/coldsauce
name = "cold sauce bottle"
desc = "Leaves the tounge numb in it's passage"
icon_state = "coldsauce"
list_reagents = list(/datum/reagent/consumable/frostoil = 50)
-/obj/item/reagent_containers/food/condiment/oliveoil
+/obj/item/reagent_containers/condiment/oliveoil
name = "olive oil bottle"
desc = "A delicious oil used in cooking"
icon_state = "oliveoil"
diff --git a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm
index 62e6a4075a93..bcee075e0dcd 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm
@@ -44,7 +44,7 @@
/obj/item/weldingtool,
/obj/item/reagent_containers/glass,
/obj/item/reagent_containers/syringe,
- /obj/item/reagent_containers/food/condiment,
+ /obj/item/reagent_containers/condiment,
/obj/item/storage,
/obj/item/smallDelivery,
)
diff --git a/code/modules/food_and_drinks/kitchen_machinery/microwave.dm b/code/modules/food_and_drinks/kitchen_machinery/microwave.dm
index 0df04a08658b..db88c5d0cc15 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/microwave.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/microwave.dm
@@ -365,6 +365,7 @@
icon_state = "ration_heater"
grind_results = list(/datum/reagent/iron = 10, /datum/reagent/water = 10, /datum/reagent/consumable/sodiumchloride = 5)
heat = 3800
+ w_class = WEIGHT_CLASS_SMALL
var/obj/item/tocook = null
var/mutable_appearance/ration_overlay
var/uses = 3
diff --git a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
index 5852ea34742b..9a6b10e0444b 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
@@ -366,7 +366,7 @@
/obj/machinery/smartfridge/drinks/accept_check(obj/item/O)
if(!istype(O, /obj/item/reagent_containers) || (O.item_flags & ABSTRACT) || !O.reagents || !O.reagents.reagent_list.len)
return FALSE
- if(istype(O, /obj/item/reagent_containers/glass) || istype(O, /obj/item/reagent_containers/food/drinks) || istype(O, /obj/item/reagent_containers/food/condiment))
+ if(istype(O, /obj/item/reagent_containers/glass) || istype(O, /obj/item/reagent_containers/food/drinks) || istype(O, /obj/item/reagent_containers/condiment))
return TRUE
// ----------------------------
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm
index 3443b32e931e..9352e1b371aa 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm
@@ -88,7 +88,6 @@
/obj/item/reagent_containers/food/snacks/meat/cutlet = 2,
/obj/item/reagent_containers/food/snacks/grown/chili = 1,
/obj/item/reagent_containers/food/snacks/grown/tomato = 1,
- /obj/item/clothing/shoes/clown_shoes = 1
)
result = /obj/item/reagent_containers/food/snacks/soup/clownchili
subcategory = CAT_SOUP
diff --git a/code/modules/holiday/easter.dm b/code/modules/holiday/easter.dm
index 5baed7a45309..a5cf4d78499e 100644
--- a/code/modules/holiday/easter.dm
+++ b/code/modules/holiday/easter.dm
@@ -84,24 +84,6 @@
. = ..()
countEggs()
-//Bunny Suit
-/obj/item/clothing/head/bunnyhead
- name = "Easter Bunny Head"
- icon_state = "bunnyhead"
- item_state = "bunnyhead"
- desc = "Considerably more cute than 'Frank'."
- slowdown = -1
- flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
-
-/obj/item/clothing/suit/bunnysuit
- name = "Easter Bunny Suit"
- desc = "Hop Hop Hop!"
- icon_state = "bunnysuit"
- item_state = "bunnysuit"
- slowdown = -1
- body_parts_covered = CHEST|GROIN|LEGS|ARMS
- flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
-
//Bunny bag!
/obj/item/storage/backpack/satchel/bunnysatchel
name = "Easter Bunny Satchel"
@@ -122,9 +104,7 @@
icon_state = "egg-[eggcolor]"
/obj/item/reagent_containers/food/snacks/egg/proc/dispensePrize(turf/where)
- var/won = pick(/obj/item/clothing/head/bunnyhead,
- /obj/item/clothing/suit/bunnysuit,
- /obj/item/storage/backpack/satchel/bunnysatchel,
+ var/won = pick(/obj/item/storage/backpack/satchel/bunnysatchel,
/obj/item/reagent_containers/food/snacks/grown/carrot,
/obj/item/toy/balloon,
/obj/item/toy/gun,
@@ -151,8 +131,7 @@
/obj/item/toy/plush/carpplushie,
/obj/item/toy/plush/spider,
/obj/item/toy/redbutton,
- /obj/item/toy/windupToolbox,
- /obj/item/clothing/head/collectable/rabbitears)
+ /obj/item/toy/windupToolbox)
new won(where)
new/obj/item/reagent_containers/food/snacks/chocolateegg(where)
diff --git a/code/modules/holiday/holidays.dm b/code/modules/holiday/holidays.dm
index ae19b1dea376..ac946eee3847 100644
--- a/code/modules/holiday/holidays.dm
+++ b/code/modules/holiday/holidays.dm
@@ -571,7 +571,6 @@
/datum/holiday/easter
name = EASTER
- drone_hat = /obj/item/clothing/head/rabbitears
var/const/days_early = 1 //to make editing the holiday easier
var/const/days_extra = 1
diff --git a/code/modules/hydroponics/grown/banana.dm b/code/modules/hydroponics/grown/banana.dm
index 64a529f8ea97..b567f0919304 100644
--- a/code/modules/hydroponics/grown/banana.dm
+++ b/code/modules/hydroponics/grown/banana.dm
@@ -110,12 +110,3 @@
name = "bluespace banana peel"
desc = "A peel from a bluespace banana."
icon_state = "bluenana_peel"
-
-// Other
-/obj/item/grown/bananapeel/specialpeel //used by /obj/item/clothing/shoes/clown_shoes/banana_shoes
- name = "synthesized banana peel"
- desc = "A synthetic banana peel."
-
-/obj/item/grown/bananapeel/specialpeel/ComponentInitialize()
- . = ..()
- AddComponent(/datum/component/slippery, 40)
diff --git a/code/modules/jobs/job_types/clown.dm b/code/modules/jobs/job_types/clown.dm
index d131d8ad4cd4..e2c0e24501b1 100644
--- a/code/modules/jobs/job_types/clown.dm
+++ b/code/modules/jobs/job_types/clown.dm
@@ -22,8 +22,7 @@
belt = /obj/item/pda/clown
ears = /obj/item/radio/headset/headset_srv
uniform = /obj/item/clothing/under/rank/civilian/clown
- alt_uniform = /obj/item/clothing/under/rank/civilian/clown/green //WS Edit - Alt Uniforms
- shoes = /obj/item/clothing/shoes/clown_shoes
+ alt_uniform = /obj/item/clothing/under/rank/civilian/clown/green
mask = /obj/item/clothing/mask/gas/clown_hat
l_pocket = /obj/item/bikehorn
backpack_contents = list(
@@ -35,8 +34,6 @@
implants = list(/obj/item/implant/sad_trombone)
- backpack = /obj/item/storage/backpack/clown
- satchel = /obj/item/storage/backpack/clown
duffelbag = /obj/item/storage/backpack/duffelbag/clown //strangely has a duffel
box = /obj/item/storage/box/hug/survival
diff --git a/code/modules/jobs/job_types/geneticist.dm b/code/modules/jobs/job_types/geneticist.dm
index 2720dcf064fd..dd8e5ef8f97a 100644
--- a/code/modules/jobs/job_types/geneticist.dm
+++ b/code/modules/jobs/job_types/geneticist.dm
@@ -25,7 +25,6 @@
l_pocket = /obj/item/sequence_scanner
backpack = /obj/item/storage/backpack/genetics
- satchel = /obj/item/storage/backpack/satchel/gen
duffelbag = /obj/item/storage/backpack/duffelbag/med
courierbag = /obj/item/storage/backpack/messenger/med
diff --git a/code/modules/jobs/job_types/head_of_personnel.dm b/code/modules/jobs/job_types/head_of_personnel.dm
index a1071d7d3ce4..d535e1fb705e 100644
--- a/code/modules/jobs/job_types/head_of_personnel.dm
+++ b/code/modules/jobs/job_types/head_of_personnel.dm
@@ -39,7 +39,6 @@
alt_suit = /obj/item/clothing/suit/ianshirt
dcoat = /obj/item/clothing/suit/hooded/wintercoat/captain //WS Edit - Alt Uniforms
shoes = /obj/item/clothing/shoes/sneakers/brown
- head = /obj/item/clothing/head/hopcap
backpack_contents = list(/obj/item/storage/box/ids=1,\
/obj/item/melee/classic_baton/telescopic=1, /obj/item/modular_computer/tablet/preset/advanced = 1)
diff --git a/code/modules/mining/abandoned_crates.dm b/code/modules/mining/abandoned_crates.dm
index ea43fe78f176..406259246db1 100644
--- a/code/modules/mining/abandoned_crates.dm
+++ b/code/modules/mining/abandoned_crates.dm
@@ -124,6 +124,10 @@
qdel(src)
..()
+// No busting open (used to disallow angle grinder cheesing
+/obj/structure/closet/crate/secure/loot/bust_open()
+ boom()
+
/obj/structure/closet/crate/secure/loot/proc/spawn_loot()
var/loot = rand(1,100) //100 different crates with varying chances of spawning
switch(loot)
@@ -178,7 +182,6 @@
new /obj/item/clothing/shoes/kindleKicks(src)
if(65 to 66)
new /obj/item/clothing/suit/ianshirt(src)
- new /obj/item/clothing/suit/hooded/ian_costume(src)
if(67 to 68)
new /obj/item/toy/plush/awakenedplushie(src)
if(69 to 70)
diff --git a/code/modules/mining/equipment/angle_grinder.dm b/code/modules/mining/equipment/angle_grinder.dm
new file mode 100644
index 000000000000..290cf0d153d7
--- /dev/null
+++ b/code/modules/mining/equipment/angle_grinder.dm
@@ -0,0 +1,144 @@
+/obj/item/gear_pack/anglegrinder
+ name = "grinder pack"
+ desc = "Supplies the high voltage needed to run the attached grinder."
+ icon = 'icons/obj/item/gear_packs.dmi'
+ item_state = "anglegrinderpack"
+ icon_state = "anglegrinderpack"
+ lefthand_file = 'icons/mob/inhands/equipment/backpack_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/equipment/backpack_righthand.dmi'
+ gear_handle_type = /obj/item/gear_handle/anglegrinder
+
+/obj/item/gear_handle/anglegrinder
+ name = "angle grinder"
+ desc = "A powerful salvage tool used to cut apart walls and airlocks. A hazard sticker recommends ear and eye protection."
+ icon = 'icons/obj/item/gear_packs.dmi'
+ icon_state = "anglegrinder"
+ item_state = "anglegrinder"
+ lefthand_file = 'icons/mob/inhands/equipment/gear_handle_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/equipment/gear_handle_righthand.dmi'
+ flags_1 = CONDUCT_1
+ force = 13
+ armour_penetration = 5
+ w_class = WEIGHT_CLASS_BULKY
+ item_flags = ABSTRACT
+ attack_verb = list("lacerated", "ripped", "sliced", "sawed", "cut", "chopped", "diced")
+ hitsound = 'sound/weapons/anglegrinder.ogg'
+ usesound = 'sound/weapons/anglegrinder.ogg'
+ tool_behaviour = null // is set to TOOL_DECONSTRUCT once wielded
+ toolspeed = 1
+ wall_decon_damage = 200
+ usecost = 5
+ pack = /obj/item/gear_pack/anglegrinder
+ var/startsound = 'sound/weapons/chainsawhit.ogg'
+ var/adv = FALSE
+ var/wielded = FALSE // track wielded status on item
+ var/two_hand_force = 24
+
+/obj/item/gear_handle/anglegrinder/tool_start_check(mob/living/user, amount)
+ if(!pack)
+ to_chat(user, "how do you not have a pack for this. what.")
+ return FALSE
+ if(!pack.cell)
+ to_chat(user, "You need a cell to start!")
+ return FALSE
+ var/obj/item/stock_parts/cell/cell = pack.get_cell()
+ if(cell.charge < usecost)
+ to_chat(user, "You need more charge to complete this task!")
+ return FALSE
+ return TRUE
+
+/obj/item/gear_handle/anglegrinder/tool_use_check(mob/living/user, amount)
+ if(!pack.cell)
+ return FALSE
+ if(pack.deductcharge(usecost))
+ return TRUE
+ else
+ to_chat(user, "You need more charge to complete this task!")
+ return FALSE
+
+/obj/item/gear_handle/anglegrinder/use(used)
+ return TRUE
+
+/obj/item/gear_handle/anglegrinder/Initialize()
+ . = ..()
+ RegisterSignal(src, COMSIG_TWOHANDED_WIELD, PROC_REF(on_wield))
+ RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, PROC_REF(on_unwield))
+
+/obj/item/gear_handle/anglegrinder/ComponentInitialize()
+ . = ..()
+ AddComponent(/datum/component/butchering, 30, 100, 0, startsound, TRUE)
+ AddComponent(/datum/component/two_handed, force_unwielded=force, force_wielded=two_hand_force, wieldsound=startsound)
+ AddElement(/datum/element/tool_bang, 2)
+
+/// triggered on wield of two handed item
+/obj/item/gear_handle/anglegrinder/proc/on_wield(obj/item/source, mob/user)
+ SIGNAL_HANDLER
+
+ tool_behaviour = TOOL_DECONSTRUCT
+ wielded = TRUE
+ sharpness = IS_SHARP
+ icon_state = "[initial(item_state)]-wield"
+ item_state = "[initial(item_state)]-wield"
+
+/// triggered on unwield of two handed item
+/obj/item/gear_handle/anglegrinder/proc/on_unwield(obj/item/source, mob/user)
+ SIGNAL_HANDLER
+
+ tool_behaviour = null
+ wielded = FALSE
+ sharpness = initial(sharpness)
+ icon_state = initial(icon_state)
+ item_state = initial(item_state)
+
+/obj/item/gear_handle/anglegrinder/get_dismemberment_chance()
+ if(wielded)
+ . = ..()
+
+/obj/item/gear_handle/anglegrinder/use_tool(atom/target, mob/living/user, delay, amount=1, volume=0, datum/callback/extra_checks)
+ if(adv)
+ target.add_overlay(GLOB.advanced_cutting_effect)
+ . = ..()
+ target.cut_overlay(GLOB.advanced_cutting_effect)
+ else
+ target.add_overlay(GLOB.cutting_effect)
+ . = ..()
+ target.cut_overlay(GLOB.cutting_effect)
+
+/obj/item/gear_pack/anglegrinder/energy
+ name = "energy supply pack"
+ desc = "a highly inefficient GEC-E-014 Supply Pack, used to generate and contain an energy field."
+ item_state = "energyanglegrinderpack"
+ icon_state = "energyanglegrinderpack"
+ gear_handle_type = /obj/item/gear_handle/anglegrinder/energy
+
+/obj/item/gear_handle/anglegrinder/energy
+ name = "energy saw"
+ desc = "An early prototype for handheld energy weapons, designed by a joint GEC-Cybersun lab to create an energy field for combat use."
+ icon_state = "energyanglegrinder"
+ item_state = "energyanglegrinder"
+ force = 5
+ two_hand_force = 28
+ armour_penetration = 16
+ w_class = WEIGHT_CLASS_BULKY
+ item_flags = ABSTRACT
+ attack_verb = list("lacerated", "ripped", "burned", "sliced", "cauterized", "seared", "diced")
+ hitsound = 'sound/weapons/blade1.ogg'
+ usesound = 'sound/weapons/blade1.ogg'
+ startsound = 'sound/weapons/saberon.ogg'
+ toolspeed = 0.7
+ usecost = 10
+ pack = /obj/item/gear_pack/anglegrinder/energy
+ light_system = MOVABLE_LIGHT
+ light_range = 3
+ light_color = LIGHT_COLOR_ELECTRIC_GREEN
+ light_on = FALSE
+ adv = TRUE
+
+/obj/item/gear_handle/anglegrinder/energy/on_wield(obj/item/source, mob/user)
+ . = ..()
+ set_light_on(TRUE)
+
+/obj/item/gear_handle/anglegrinder/energy/on_unwield(obj/item/source, mob/user)
+ . = ..()
+ set_light_on(FALSE)
+
diff --git a/code/modules/mining/equipment/kinetic_crusher.dm b/code/modules/mining/equipment/kinetic_crusher.dm
index 3e0bed238bec..05e81421ac4f 100644
--- a/code/modules/mining/equipment/kinetic_crusher.dm
+++ b/code/modules/mining/equipment/kinetic_crusher.dm
@@ -8,7 +8,7 @@
name = "proto-magnetic crusher"
desc = "A multipurpose disembarkation and self-defense tool designed by EXOCOM using an incomplete Nanotrasen prototype. \
Found in the grime-stained hands of wannabee explorers across the frontier, it cuts rock and hews flora using magnetic osscilation and a heavy cleaving edge."
- force = 0 //You can't hit stuff unless wielded
+ force = 0 //You can't hit stuff unless it's wielded
w_class = WEIGHT_CLASS_BULKY
slot_flags = ITEM_SLOT_BACK
throwforce = 5
@@ -28,33 +28,19 @@
var/charge_time = 15
var/detonation_damage = 20
var/backstab_bonus = 10
- var/wielded = FALSE // track wielded status on item
-
-/obj/item/kinetic_crusher/Initialize()
- . = ..()
- RegisterSignal(src, COMSIG_TWOHANDED_WIELD, PROC_REF(on_wield))
- RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, PROC_REF(on_unwield))
/obj/item/kinetic_crusher/ComponentInitialize()
. = ..()
AddComponent(/datum/component/butchering, 60, 110) //technically it's huge and bulky, but this provides an incentive to use it
AddComponent(/datum/component/two_handed, force_unwielded=0, force_wielded=15)
-/// triggered on wield of two handed item
-/obj/item/kinetic_crusher/proc/on_wield(obj/item/source, mob/user)
- wielded = TRUE
-
-/// triggered on unwield of two handed item
-/obj/item/kinetic_crusher/proc/on_unwield(obj/item/source, mob/user)
- wielded = FALSE
-
/obj/item/kinetic_crusher/examine(mob/living/user)
. = ..()
. += "Induce magnetism in an enemy by striking them with a magnetospheric wave, then hit them in melee to force a waveform collapse for [force + detonation_damage] damage."
. += "Does [force + detonation_damage + backstab_bonus] damage if the target is backstabbed, instead of [force + detonation_damage]."
/obj/item/kinetic_crusher/attack(mob/living/target, mob/living/carbon/user)
- if(!wielded)
+ if(!HAS_TRAIT(src, TRAIT_WIELDED))
to_chat(user, "[src] is too heavy to use with one hand! You fumble and drop everything.")
user.drop_all_held_items()
return
@@ -66,7 +52,7 @@
/obj/item/kinetic_crusher/afterattack(atom/target, mob/living/user, proximity_flag, clickparams)
. = ..()
- if(!wielded)
+ if(!HAS_TRAIT(src, TRAIT_WIELDED))
return
if(!proximity_flag && charged)//Mark a target, or mine a tile.
var/turf/proj_turf = user.loc
@@ -118,7 +104,7 @@
/obj/item/kinetic_crusher/update_icon_state()
- item_state = "crusher[wielded]" // this is not icon_state and not supported by 2hcomponent
+ item_state = "crusher[HAS_TRAIT(src, TRAIT_WIELDED)]" // this is not icon_state and not supported by 2hcomponent
return ..()
/obj/item/kinetic_crusher/update_overlays()
@@ -182,7 +168,7 @@
user.changeNext_move(CLICK_CD_MELEE * 2.0)//...slow swinga.
/obj/item/kinetic_crusher/old/update_icon_state()
- item_state = "crusherold[wielded]" // still not supported by 2hcomponent
+ item_state = "crusherold[HAS_TRAIT(src, TRAIT_WIELDED)]" // still not supported by 2hcomponent
return ..()
//100% original syndicate oc, plz do not steal. More effective against human targets then the typical crusher, with a bit of block chance.
@@ -195,7 +181,7 @@
name = "magnetic cleaver"
desc = "Designed by Syndicate Research and Development for their resource-gathering operations on hostile worlds. Syndicate Legal Ops would like to stress that you've never seen anything like this before. Ever."
armour_penetration = 69//nice cut
- force = 0 //You can't hit stuff unless wielded
+ force = 0 //You can't hit stuff unless HAS_TRAIT(src, TRAIT_WIELDED)
w_class = WEIGHT_CLASS_BULKY
slot_flags = ITEM_SLOT_BACK
throwforce = 5
@@ -216,35 +202,40 @@
charge_time = 15
detonation_damage = 35
backstab_bonus = 15
- wielded = FALSE // track wielded status on item
actions_types = list()
+
+/obj/item/kinetic_crusher/syndie_crusher/Initialize()
+ . = ..()
+ RegisterSignal(src, COMSIG_TWOHANDED_WIELD, PROC_REF(on_wield))
+ RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, PROC_REF(on_unwield))
+
/obj/item/kinetic_crusher/syndie_crusher/ComponentInitialize()
. = ..()
AddComponent(/datum/component/butchering, 60, 150)
AddComponent(/datum/component/two_handed, force_unwielded=0, force_wielded=10)
/// triggered on wield of two handed item
-/obj/item/kinetic_crusher/syndie_crusher/on_wield(obj/item/source, mob/user)
- . = ..()
- wielded = TRUE
+/obj/item/kinetic_crusher/syndie_crusher/proc/on_wield(obj/item/source, mob/user)
+ SIGNAL_HANDLER
+
icon_state = "crushersyndie1"
playsound(user, 'sound/weapons/saberon.ogg', 35, TRUE)
- set_light_on(wielded)
+ set_light_on(HAS_TRAIT(src, TRAIT_WIELDED))
/// triggered on unwield of two handed item
-/obj/item/kinetic_crusher/syndie_crusher/on_unwield(obj/item/source, mob/user)
- . = ..()
- wielded = FALSE
+/obj/item/kinetic_crusher/syndie_crusher/proc/on_unwield(obj/item/source, mob/user)
+ SIGNAL_HANDLER
+
icon_state = "crushersyndie"
playsound(user, 'sound/weapons/saberoff.ogg', 35, TRUE)
- set_light_on(wielded)
+ set_light_on(HAS_TRAIT(src, TRAIT_WIELDED))
/obj/item/kinetic_crusher/syndie_crusher/update_icon_state()
- item_state = "crushersyndie[wielded]" // this is not icon_state and not supported by 2hcomponent
+ item_state = "crushersyndie[HAS_TRAIT(src, TRAIT_WIELDED)]" // this is not icon_state and not supported by 2hcomponent
return ..()
/obj/item/kinetic_crusher/syndie_crusher/update_overlays()
. = ..()
- if(wielded)
+ if(HAS_TRAIT(src, TRAIT_WIELDED))
. += "[icon_state]_lit"
diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm
index 3cb8f02ab023..73d18f0ab885 100644
--- a/code/modules/mining/lavaland/necropolis_chests.dm
+++ b/code/modules/mining/lavaland/necropolis_chests.dm
@@ -20,7 +20,7 @@
if(3)
new /obj/item/necromantic_stone/lava(src)
if(5)
- new /obj/item/clothing/glasses/godeye(src)
+ new /obj/item/pickaxe/diamond(src)
if(6)
new /obj/item/reagent_containers/glass/bottle/potion/flight(src)
if(7)
@@ -91,7 +91,7 @@
if(3)
new /obj/item/necromantic_stone/lava(src)
if(5)
- new /obj/item/clothing/glasses/godeye(src)
+ new /obj/item/pickaxe/diamond(src)
if(6)
new /obj/item/reagent_containers/glass/bottle/potion/flight(src)
if(7)
@@ -698,7 +698,6 @@
var/hat = pick(/obj/item/clothing/head/helmet/roman, /obj/item/clothing/head/helmet/roman/legionnaire)
H.equip_to_slot_or_del(new hat(H), ITEM_SLOT_HEAD)
H.equip_to_slot_or_del(new /obj/item/clothing/under/costume/roman(H), ITEM_SLOT_ICLOTHING)
- H.equip_to_slot_or_del(new /obj/item/clothing/shoes/roman(H), ITEM_SLOT_FEET)
H.put_in_hands(new /obj/item/shield/riot/roman(H), TRUE)
H.put_in_hands(new /obj/item/melee/sword/claymore(H), TRUE)
H.equip_to_slot_or_del(new /obj/item/melee/spear(H), ITEM_SLOT_BACK)
diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm
index 4b2774c3894a..d8a9ecf90cad 100644
--- a/code/modules/mining/machine_vending.dm
+++ b/code/modules/mining/machine_vending.dm
@@ -22,7 +22,6 @@
/obj/item/mining_scanner = 2,
/obj/item/t_scanner/adv_mining_scanner = 2,
/obj/item/hivelordstabilizer = 3,
- /obj/item/clothing/glasses/meson/gar = 2,
/obj/item/kinetic_crusher = 1,
/obj/item/gun/energy/kinetic_accelerator = 2,
/obj/item/pickaxe/silver = 1,
diff --git a/code/modules/mob/dead/new_player/sprite_accessories/elzuose.dm b/code/modules/mob/dead/new_player/sprite_accessories/elzuose.dm
index 58317b5ab91a..9a15f0270fdf 100644
--- a/code/modules/mob/dead/new_player/sprite_accessories/elzuose.dm
+++ b/code/modules/mob/dead/new_player/sprite_accessories/elzuose.dm
@@ -37,6 +37,18 @@
name = "Sharp"
icon_state = "sharp"
+/datum/sprite_accessory/elzu_horns/cervid
+ name = "Cervid"
+ icon_state = "cervid"
+
+/datum/sprite_accessory/elzu_horns/prong
+ name = "Prong"
+ icon_state = "prong"
+
+/datum/sprite_accessory/elzu_horns/brow
+ name = "Brow"
+ icon_state = "brow"
+
//Start tails
/datum/sprite_accessory/tails/elzu
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 3ed2b86816ac..9a19e198a555 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -386,7 +386,7 @@
/mob/living/carbon/get_standard_pixel_y_offset(lying = 0)
if(lying)
- return -6
+ return PIXEL_Y_OFFSET_LYING
else
return initial(pixel_y)
diff --git a/code/modules/mob/living/carbon/human/species_types/snail.dm b/code/modules/mob/living/carbon/human/species_types/snail.dm
index 4d9d41bd411d..5f47ab21e479 100644
--- a/code/modules/mob/living/carbon/human/species_types/snail.dm
+++ b/code/modules/mob/living/carbon/human/species_types/snail.dm
@@ -12,7 +12,6 @@
siemens_coeff = 2 //snails are mostly water
changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | RACE_SWAP
sexes = FALSE //snails are hermaphrodites
- var/shell_type = /obj/item/storage/backpack/snail
mutanteyes = /obj/item/organ/eyes/snail
mutanttongue = /obj/item/organ/tongue/snail
@@ -41,38 +40,8 @@
/datum/species/snail/on_species_gain(mob/living/carbon/C, datum/species/old_species, pref_load)
. = ..()
- var/obj/item/storage/backpack/bag = C.get_item_by_slot(ITEM_SLOT_BACK)
- if(!istype(bag, /obj/item/storage/backpack/snail))
- if(C.dropItemToGround(bag)) //returns TRUE even if its null
- C.equip_to_slot_or_del(new /obj/item/storage/backpack/snail(C), ITEM_SLOT_BACK)
C.AddElement(/datum/element/snailcrawl)
/datum/species/snail/on_species_loss(mob/living/carbon/C)
. = ..()
C.RemoveElement(/datum/element/snailcrawl)
- var/obj/item/storage/backpack/bag = C.get_item_by_slot(ITEM_SLOT_BACK)
- if(istype(bag, /obj/item/storage/backpack/snail))
- bag.emptyStorage()
- C.temporarilyRemoveItemFromInventory(bag, TRUE)
- qdel(bag)
-
-/obj/item/storage/backpack/snail
- name = "snail shell"
- desc = "Worn by snails as armor and storage compartment."
- icon_state = "snailshell"
- item_state = "snailshell"
- lefthand_file = 'icons/mob/inhands/equipment/backpack_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/equipment/backpack_righthand.dmi'
- armor = list("melee" = 40, "bullet" = 30, "laser" = 30, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 50)
- max_integrity = 200
- resistance_flags = FIRE_PROOF | ACID_PROOF
-
-/obj/item/storage/backpack/snail/dropped(mob/user, silent)
- . = ..()
- emptyStorage()
- if(!QDELETED(src))
- qdel(src)
-
-/obj/item/storage/backpack/snail/Initialize()
- . = ..()
- ADD_TRAIT(src, TRAIT_NODROP, "snailshell")
diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm
index 540dddb9a489..1400d2c641ca 100644
--- a/code/modules/mob/living/carbon/human/update_icons.dm
+++ b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -150,8 +150,8 @@ There are several things that need to be remembered:
else if(dna.species.bodytype & BODYTYPE_KEPORI)
if(U.supports_variations & KEPORI_VARIATION)
icon_file = KEPORI_UNIFORM_PATH
- if(U.kepoi_override_icon)
- icon_file = U.kepoi_override_icon
+ if(U.kepori_override_icon)
+ icon_file = U.kepori_override_icon
else
handled_by_bodytype = TRUE
@@ -243,8 +243,8 @@ There are several things that need to be remembered:
else if(dna.species.bodytype & BODYTYPE_KEPORI)
if(I.supports_variations & KEPORI_VARIATION)
icon_file = KEPORI_GLOVES_PATH
- if(I.kepoi_override_icon)
- icon_file = I.kepoi_override_icon
+ if(I.kepori_override_icon)
+ icon_file = I.kepori_override_icon
else
handled_by_bodytype = TRUE
@@ -295,8 +295,8 @@ There are several things that need to be remembered:
else if(dna.species.bodytype & BODYTYPE_KEPORI)
if(I.supports_variations & KEPORI_VARIATION)
icon_file = KEPORI_GLASSES_PATH
- if(I.kepoi_override_icon)
- icon_file = I.kepoi_override_icon
+ if(I.kepori_override_icon)
+ icon_file = I.kepori_override_icon
else
handled_by_bodytype = TRUE
@@ -346,8 +346,8 @@ There are several things that need to be remembered:
else if(dna.species.bodytype & BODYTYPE_KEPORI)
if(I.supports_variations & KEPORI_VARIATION)
icon_file = KEPORI_EARS_PATH
- if(I.kepoi_override_icon)
- icon_file = I.kepoi_override_icon
+ if(I.kepori_override_icon)
+ icon_file = I.kepori_override_icon
else
handled_by_bodytype = TRUE
@@ -407,8 +407,8 @@ There are several things that need to be remembered:
else if(dna.species.bodytype & BODYTYPE_KEPORI)
if(I.supports_variations & KEPORI_VARIATION)
icon_file = KEPORI_SHOES_PATH
- if(I.kepoi_override_icon)
- icon_file = I.kepoi_override_icon
+ if(I.kepori_override_icon)
+ icon_file = I.kepori_override_icon
else
handled_by_bodytype = TRUE
@@ -507,8 +507,8 @@ There are several things that need to be remembered:
else if(dna.species.bodytype & BODYTYPE_KEPORI)
if(I.supports_variations & KEPORI_VARIATION)
icon_file = KEPORI_HEAD_PATH
- if(I.kepoi_override_icon)
- icon_file = I.kepoi_override_icon
+ if(I.kepori_override_icon)
+ icon_file = I.kepori_override_icon
else
handled_by_bodytype = TRUE
@@ -557,8 +557,8 @@ There are several things that need to be remembered:
else if(dna.species.bodytype & BODYTYPE_KEPORI)
if(I.supports_variations & KEPORI_VARIATION)
icon_file = KEPORI_BELT_PATH
- if(I.kepoi_override_icon)
- icon_file = I.kepoi_override_icon
+ if(I.kepori_override_icon)
+ icon_file = I.kepori_override_icon
else
handled_by_bodytype = TRUE
@@ -615,8 +615,8 @@ There are several things that need to be remembered:
else if(dna.species.bodytype & BODYTYPE_KEPORI)
if(I.supports_variations & KEPORI_VARIATION)
icon_file = KEPORI_SUIT_PATH
- if(I.kepoi_override_icon)
- icon_file = I.kepoi_override_icon
+ if(I.kepori_override_icon)
+ icon_file = I.kepori_override_icon
else
handled_by_bodytype = TRUE
@@ -698,8 +698,8 @@ There are several things that need to be remembered:
else if(dna.species.bodytype & BODYTYPE_KEPORI)
if(I.supports_variations & KEPORI_VARIATION)
icon_file = KEPORI_MASK_PATH
- if(I.kepoi_override_icon)
- icon_file = I.kepoi_override_icon
+ if(I.kepori_override_icon)
+ icon_file = I.kepori_override_icon
else
handled_by_bodytype = TRUE
@@ -739,6 +739,7 @@ There are several things that need to be remembered:
update_hud_neck(I)
+
if(!(ITEM_SLOT_NECK in check_obscured_slots()))
if(dna.species.bodytype & BODYTYPE_VOX) // there is no kepori neck path, we just tell it to greyscale no matter what
@@ -798,10 +799,12 @@ There are several things that need to be remembered:
handled_by_bodytype = TRUE
else if(dna.species.bodytype & BODYTYPE_KEPORI)
-// if(I.supports_variations & KEPORI_VARIATION)
-// icon_file = KEPORI_BACK_PATH
-// else
- handled_by_bodytype = TRUE
+ if(I.supports_variations & KEPORI_VARIATION)
+ icon_file = KEPORI_BACK_PATH
+ if(I.kepori_override_icon)
+ icon_file = I.kepori_override_icon
+ else
+ handled_by_bodytype = TRUE
if(!icon_exists(icon_file, RESOLVE_ICON_STATE(I)))
icon_file = I.mob_overlay_icon ? I.mob_overlay_icon : DEFAULT_BACK_PATH
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index 27819d97cf15..f9bb15bb5941 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -782,7 +782,7 @@
basic_modules = list(
/obj/item/assembly/flash/cyborg,
/obj/item/reagent_containers/glass/beaker/large, //I know a shaker is more appropiate but this is for ease of identification
- /obj/item/reagent_containers/food/condiment/enzyme,
+ /obj/item/reagent_containers/condiment/enzyme,
/obj/item/pen,
/obj/item/toy/crayon/spraycan/borg,
/obj/item/extinguisher/mini,
@@ -806,7 +806,7 @@
/obj/item/robot_module/butler/respawn_consumable(mob/living/silicon/robot/R, coeff = 1)
..()
- var/obj/item/reagent_containers/O = locate(/obj/item/reagent_containers/food/condiment/enzyme) in basic_modules
+ var/obj/item/reagent_containers/O = locate(/obj/item/reagent_containers/condiment/enzyme) in basic_modules
if(O)
O.reagents.add_reagent(/datum/reagent/consumable/enzyme, 2 * coeff)
diff --git a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
index a1884b76298e..65baddfee360 100644
--- a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
+++ b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
@@ -12,7 +12,7 @@
speak_chance = 1
turns_per_move = 5
see_in_dark = 6
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab = 4, /obj/item/clothing/head/goatpelt = 1)
+ butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab = 4)
response_help_continuous = "pets"
response_help_simple = "pet"
response_disarm_continuous = "gently pushes aside"
diff --git a/code/modules/mob/living/simple_animal/friendly/penguin.dm b/code/modules/mob/living/simple_animal/friendly/penguin.dm
index 8376f6741eb7..5e39c3c8a51d 100644
--- a/code/modules/mob/living/simple_animal/friendly/penguin.dm
+++ b/code/modules/mob/living/simple_animal/friendly/penguin.dm
@@ -35,14 +35,6 @@
gold_core_spawnable = FRIENDLY_SPAWN
butcher_results = list(/obj/item/organ/ears/penguin = 1, /obj/item/reagent_containers/food/snacks/meat/slab/penguin = 3)
-/mob/living/simple_animal/pet/penguin/emperor/shamebrero
- name = "Shamebrero penguin"
- desc = "Shameful of all he surveys."
- icon_state = "penguin_shamebrero"
- icon_living = "penguin_shamebrero"
- gold_core_spawnable = NO_SPAWN
- unique_pet = TRUE
-
/mob/living/simple_animal/pet/penguin/baby
speak = list("gah", "noot noot", "noot!", "noot", "squeee!", "noo!")
name = "Penguin chick"
diff --git a/code/modules/mob/living/simple_animal/hostile/human/skeleton.dm b/code/modules/mob/living/simple_animal/hostile/human/skeleton.dm
index 147c2081f622..12a3c2b2604c 100644
--- a/code/modules/mob/living/simple_animal/hostile/human/skeleton.dm
+++ b/code/modules/mob/living/simple_animal/hostile/human/skeleton.dm
@@ -48,7 +48,6 @@
deathmessage = "collapses into a pile of bones, its gear clanging as it hits the ground!"
loot = list(/obj/effect/decal/remains/human,
/obj/item/clothing/suit/armor/witchhunter,
- /obj/item/clothing/head/witchunter,
/obj/item/melee/sword/claymore{name = "holy sword"})
/mob/living/simple_animal/hostile/human/skeleton/ice
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm
index b7ca291a5be4..bd9133ffce20 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm
@@ -297,6 +297,8 @@
/// track our timers and reagents
/obj/item/organ/legion_skull/proc/skull_check()
+ if(!owner)
+ return
if(!malignance)
malignance = new()
malignance.infect(owner, FALSE)
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm
index 1a347db1646b..4869d4a95c1c 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm
@@ -25,7 +25,6 @@
/obj/item/clothing/suit/hooded/wintercoat = 1,
/obj/item/clothing/suit/jacket = 1,
/obj/item/clothing/suit/jacket/leather = 1,
- /obj/item/clothing/suit/jacket/leather/overcoat = 1,
/obj/item/clothing/suit/jacket/leather/duster = 1,
/obj/item/clothing/suit/jacket/miljacket = 1,
/obj/item/clothing/suit/jacket/puffer = 1,
@@ -81,7 +80,6 @@
/obj/item/clothing/head/hardhat/orange = 2,
/obj/item/clothing/head/hardhat/dblue = 2,
/obj/item/clothing/head/pirate = 1,
- /obj/item/clothing/head/foilhat = 1
)
)
if(prob(50))
diff --git a/code/modules/mod/modules/modules_general.dm b/code/modules/mod/modules/modules_general.dm
index 8c5f9e27cf55..17f72271b312 100644
--- a/code/modules/mod/modules/modules_general.dm
+++ b/code/modules/mod/modules/modules_general.dm
@@ -375,12 +375,8 @@
/obj/item/clothing/head/centhat,
/obj/item/clothing/head/pirate,
/obj/item/clothing/head/santa,
- /obj/item/clothing/head/hardhat/reindeer,
- /obj/item/clothing/head/sombrero,
/obj/item/clothing/head/kitty,
- /obj/item/clothing/head/rabbitears,
/obj/item/clothing/head/festive,
- /obj/item/clothing/head/powdered_wig,
/obj/item/clothing/head/that,
/obj/item/clothing/head/nursehat,
/obj/item/clothing/head/chefhat,
diff --git a/code/modules/overmap/missions/acquire_mission.dm b/code/modules/overmap/missions/acquire_mission.dm
index 8a3424c8eb11..ea55beb00120 100644
--- a/code/modules/overmap/missions/acquire_mission.dm
+++ b/code/modules/overmap/missions/acquire_mission.dm
@@ -180,14 +180,6 @@ Acquire: Anomaly
weight = 2
objective_type = /mob/living/simple_animal/hostile/asteroid/ice_whelp
-/datum/mission/acquire/creature/ice_demon
- name = "Capture an ice demon"
- desc = "I require a live ice demon for research purposes. Trap one within the given \
- Lifeform Containment Unit and return it to me and you will be paid handsomely."
- value = 1500
- weight = 2
- objective_type = /mob/living/simple_animal/hostile/asteroid/ice_demon
-
/datum/mission/acquire/creature/migo
name = "Capture a live mi-go"
desc = "I require a live mi-go for research purposes. Trap one within the given \
diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm
index 75cf85513236..4f2d70b680ad 100644
--- a/code/modules/power/apc.dm
+++ b/code/modules/power/apc.dm
@@ -217,7 +217,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/auto_name, 25)
// this allows the APC to be embedded in a wall, yet still inside an area
if (building)
setDir(ndir)
- tdir = dir// to fix Vars bug
+ tdir = dir
switch(tdir)
if(NORTH)
diff --git a/code/modules/power/power.dm b/code/modules/power/power.dm
index a386a739622d..7c7dc8692cb5 100644
--- a/code/modules/power/power.dm
+++ b/code/modules/power/power.dm
@@ -377,8 +377,9 @@
//source is an object caused electrocuting (airlock, grille, etc)
//siemens_coeff - layman's terms, conductivity
//dist_check - set to only shock mobs within 1 of source (vendors, airlocks, etc.)
+//drain_energy - whether the shock will drain power from the mech. Enabled by default.
//No animations will be performed by this proc.
-/proc/electrocute_mob(mob/living/carbon/victim, power_source, obj/source, siemens_coeff = 1, dist_check = FALSE)
+/proc/electrocute_mob(mob/living/carbon/victim, power_source, obj/source, siemens_coeff = 1, dist_check = FALSE, drain_energy = TRUE)
if(!istype(victim) || ismecha(victim.loc))
return FALSE //feckin mechs are dumb
diff --git a/code/modules/projectiles/ammunition/energy/plasma.dm b/code/modules/projectiles/ammunition/energy/plasma.dm
index 00de4a90ffee..d593086157fd 100644
--- a/code/modules/projectiles/ammunition/energy/plasma.dm
+++ b/code/modules/projectiles/ammunition/energy/plasma.dm
@@ -2,10 +2,9 @@
projectile_type = /obj/projectile/plasma
select_name = "plasma burst"
fire_sound = 'sound/weapons/plasma_cutter.ogg'
- delay = 15
- e_cost = 25
+ delay = 30
+ e_cost = 100
/obj/item/ammo_casing/energy/plasma/adv
projectile_type = /obj/projectile/plasma/adv
- delay = 10
- e_cost = 10
+ delay = 20
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index 28ef8cecdd80..f848018a6115 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -70,6 +70,9 @@
var/casing_ejector = TRUE
///Whether the gun has an internal magazine or a detatchable one. Overridden by BOLT_TYPE_NO_BOLT.
var/internal_magazine = FALSE
+ ///Whether the gun *can* be reloaded
+ var/sealed_magazine = FALSE
+
///Phrasing of the magazine in examine and notification messages; ex: magazine, box, etx
var/magazine_wording = "magazine"
@@ -331,6 +334,8 @@
muzzle_flash = new(src, muzzleflash_iconstate)
build_zooming()
build_firemodes()
+ if(sawn_off)
+ sawoff(forced = TRUE)
/obj/item/gun/ComponentInitialize()
. = ..()
@@ -362,9 +367,6 @@
wielded_fully = TRUE
return TRUE
-/obj/item/gun/proc/is_wielded()
- return wielded
-
/// triggered on unwield of two handed item
/obj/item/gun/proc/on_unwield(obj/item/source, mob/user)
wielded = FALSE
@@ -372,6 +374,9 @@
zoom(user, forced_zoom = FALSE)
user.remove_movespeed_modifier(/datum/movespeed_modifier/gun)
+/obj/item/gun/proc/is_wielded()
+ return wielded
+
/obj/item/gun/Destroy()
if(chambered) //Not all guns are chambered (EMP'ed energy guns etc)
QDEL_NULL(chambered)
@@ -1109,3 +1114,46 @@
var/safety_prefix = "[our_gun.adjust_fire_select_icon_state_on_safety ? "[our_gun.safety ? "safety_" : ""]" : ""]"
button_icon_state = "[safety_prefix][our_gun.fire_select_icon_state_prefix][current_firemode]"
return ..()
+
+GLOBAL_LIST_INIT(gun_saw_types, typecacheof(list(
+ /obj/item/gun/energy/plasmacutter,
+ /obj/item/melee/transforming/energy,
+ )))
+
+///Handles all the logic of sawing off guns,
+/obj/item/gun/proc/try_sawoff(mob/user, obj/item/saw)
+ if(!saw.get_sharpness() || !is_type_in_typecache(saw, GLOB.gun_saw_types) && saw.tool_behaviour != TOOL_SAW) //needs to be sharp. Otherwise turned off eswords can cut this.
+ return
+ if(sawn_off)
+ to_chat(user, span_warning("\The [src] is already shortened!"))
+ return
+ user.changeNext_move(CLICK_CD_MELEE)
+ user.visible_message(span_notice("[user] begins to shorten \the [src]."), span_notice("You begin to shorten \the [src]..."))
+
+ //if there's any live ammo inside the gun, makes it go off
+ if(blow_up(user))
+ user.visible_message(span_danger("\The [src] goes off!"), span_danger("\The [src] goes off in your face!"))
+ return
+
+ if(do_after(user, 30, target = src))
+ user.visible_message(span_notice("[user] shortens \the [src]!"), span_notice("You shorten \the [src]."))
+ sawoff(user, saw)
+
+///Used on init or try_sawoff
+/obj/item/gun/proc/sawoff(forced = FALSE)
+ if(sawn_off && !forced)
+ return
+ name = "sawn-off [src.name]"
+ desc = sawn_desc
+ w_class = WEIGHT_CLASS_NORMAL
+ item_state = "gun"
+ slot_flags &= ~ITEM_SLOT_BACK //you can't sling it on your back
+ slot_flags |= ITEM_SLOT_BELT //but you can wear it on your belt (poorly concealed under a trenchcoat, ideally)
+ recoil = SAWN_OFF_RECOIL
+ sawn_off = TRUE
+ update_appearance()
+ return TRUE
+
+///used for sawing guns, causes the gun to fire without the input of the user
+/obj/item/gun/proc/blow_up(mob/user)
+ return
diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm
index 00f48cc29239..f64586871ccf 100644
--- a/code/modules/projectiles/guns/ballistic.dm
+++ b/code/modules/projectiles/guns/ballistic.dm
@@ -205,6 +205,9 @@
. = ..()
if (.)
return
+ if(sealed_magazine)
+ to_chat(user, span_warning("The magazine on [src] is sealed and cannot be reloaded!"))
+ return
if (!internal_magazine && istype(A, /obj/item/ammo_box/magazine))
var/obj/item/ammo_box/magazine/AM = A
if (!magazine)
@@ -230,7 +233,7 @@
update_appearance()
return
if (can_be_sawn_off)
- if (sawoff(user, A))
+ if (try_sawoff(user, A))
return
return FALSE
@@ -336,43 +339,7 @@
rounds.Add(magazine.ammo_list(drop_all))
return rounds
-GLOBAL_LIST_INIT(gun_saw_types, typecacheof(list(
- /obj/item/gun/energy/plasmacutter,
- /obj/item/melee/transforming/energy,
- )))
-
-///Handles all the logic of sawing off guns,
-/obj/item/gun/ballistic/proc/sawoff(mob/user, obj/item/saw)
- if(!saw.get_sharpness() || !is_type_in_typecache(saw, GLOB.gun_saw_types) && saw.tool_behaviour != TOOL_SAW) //needs to be sharp. Otherwise turned off eswords can cut this.
- return
- if(sawn_off)
- to_chat(user, "\The [src] is already shortened!")
- return
- user.changeNext_move(CLICK_CD_MELEE)
- user.visible_message("[user] begins to shorten \the [src].", "You begin to shorten \the [src]...")
-
- //if there's any live ammo inside the gun, makes it go off
- if(blow_up(user))
- user.visible_message("\The [src] goes off!", "\The [src] goes off in your face!")
- return
-
- if(do_after(user, 30, target = src))
- if(sawn_off)
- return
- user.visible_message("[user] shortens \the [src]!", "You shorten \the [src].")
- name = "sawn-off [src.name]"
- desc = sawn_desc
- w_class = WEIGHT_CLASS_NORMAL
- item_state = "gun"
- slot_flags &= ~ITEM_SLOT_BACK //you can't sling it on your back
- slot_flags |= ITEM_SLOT_BELT //but you can wear it on your belt (poorly concealed under a trenchcoat, ideally)
- recoil = SAWN_OFF_RECOIL
- sawn_off = TRUE
- update_appearance()
- return TRUE
-
-///used for sawing guns, causes the gun to fire without the input of the user
-/obj/item/gun/ballistic/proc/blow_up(mob/user)
+/obj/item/gun/ballistic/blow_up(mob/user)
. = FALSE
for(var/obj/item/ammo_casing/AC in magazine.stored_ammo)
if(AC.BB)
diff --git a/code/modules/projectiles/guns/ballistic/launchers.dm b/code/modules/projectiles/guns/ballistic/launchers.dm
index e3e821c72db1..2044fae60ee2 100644
--- a/code/modules/projectiles/guns/ballistic/launchers.dm
+++ b/code/modules/projectiles/guns/ballistic/launchers.dm
@@ -40,30 +40,69 @@
actions_types = list()
casing_ejector = FALSE
+GLOBAL_LIST_INIT(rpg_scrawlings, list(
+ "\"FRONT TOWARDS ENEMY\"",
+ "\"MY WIFE LEFT ME\"",
+ "A Kepori inset in a stylized crimson heart",
+ "\"Eat lead psychohazard!\"",
+ "\"Portable Demotion\"",
+ "A drawing of the Rilena character 'T4L1' smoking a boof",
+ "\"Eat it corpo!\"",
+ "A Sarathi woman in a suggestive pose",
+ "\"Arm this!\""
+))
+
+
/obj/item/gun/ballistic/rocketlauncher
name = "\improper PML-9"
- desc = "A reusable rocket-propelled grenade launcher. The words \"NT this way\" and an arrow have been written near the barrel."
+ desc = "A reusable rocket-propelled grenade launcher."
icon_state = "rocketlauncher"
item_state = "rocketlauncher"
mag_type = /obj/item/ammo_box/magazine/internal/rocketlauncher
fire_sound = 'sound/weapons/gun/general/rocket_launch.ogg'
load_sound = 'sound/weapons/gun/general/rocket_load.ogg'
- w_class = WEIGHT_CLASS_BULKY
+ gun_firemodes = list(FIREMODE_SEMIAUTO)
burst_size = 1
fire_delay = 0.4 SECONDS
- casing_ejector = FALSE
+
weapon_weight = WEAPON_HEAVY
+ w_class = WEIGHT_CLASS_BULKY
+
+ //Bolt
bolt_type = BOLT_TYPE_NO_BOLT
- internal_magazine = TRUE
+
+ ///Magazine stuff
cartridge_wording = "rocket"
+ internal_magazine = TRUE
empty_indicator = TRUE
tac_reloads = FALSE
+ casing_ejector = FALSE
+
manufacturer = MANUFACTURER_SCARBOROUGH
+ attack_verb = list("bludgeoned", "hit", "slammed", "whacked")
+
valid_attachments = list()
slot_available = list()
+ var/rpg_scribble = null
+
+/obj/item/gun/ballistic/rocketlauncher/Initialize()
+ . = ..()
+ rpg_scribble = pick(GLOB.rpg_scrawlings)
+ desc += " [rpg_scribble] is scrawled on the tube"
+
+/obj/item/gun/ballistic/rocketlauncher/attackby(obj/item/A, mob/user, params)
+ . = ..()
+ if(istype(A, /obj/item/pen))
+ rpg_scribble = stripped_input(user, "What are you putting on [src]?", "Rocket Launcher Doodle")
+ if(!rpg_scribble || !length(rpg_scribble))
+ desc = "[src::desc]"
+ return
+ desc = "[src::desc] [rpg_scribble] is scribbled on the body."
+
+
/obj/item/gun/ballistic/rocketlauncher/afterattack()
. = ..()
magazine.get_round(FALSE) //Hack to clear the mag after it's fired
@@ -80,6 +119,9 @@
righthand_file = 'icons/obj/guns/manufacturer/solararmories/righthand.dmi'
mob_overlay_icon = 'icons/obj/guns/manufacturer/solararmories/onmob.dmi'
+ //recoiless rifles use shells
+ cartridge_wording = "shell"
+
icon_state = "panzerfaust"
item_state = "panzerfaust"
manufacturer = MANUFACTURER_SOLARARMORIES
diff --git a/code/modules/projectiles/guns/ballistic/rifle.dm b/code/modules/projectiles/guns/ballistic/rifle.dm
index 2be77ee20835..a61413057606 100644
--- a/code/modules/projectiles/guns/ballistic/rifle.dm
+++ b/code/modules/projectiles/guns/ballistic/rifle.dm
@@ -94,7 +94,7 @@
/obj/item/gun/ballistic/rifle/illestren/empty //i had to name it empty instead of no_mag because else it wouldnt work with guncases. sorry!
spawnwithmagazine = FALSE
-/obj/item/gun/ballistic/rifle/illestren/sawoff(mob/user)
+/obj/item/gun/ballistic/rifle/illestren/sawoff(forced = FALSE)
. = ..()
if(.)
spread = 24
@@ -114,22 +114,15 @@
icon_state = "illestren_factory"
item_state = "illestren_factory"
-/obj/item/gun/ballistic/rifle/illestren/sawoff(mob/user)
+/obj/item/gun/ballistic/rifle/illestren/sawoff(forced = FALSE)
. = ..()
if(.)
item_state = "illestren_factory_sawn"
mob_overlay_state = item_state
/obj/item/gun/ballistic/rifle/illestren/sawn
- name = "sawn-off Illestren rifle"
desc = "An Illestren rifle sawn down to a ridiculously small size. There was probably a reason it wasn't made this short to begin with, but it still packs a punch."
- item_state = "illestren_sawn"
sawn_off = TRUE
- weapon_weight = WEAPON_MEDIUM
- w_class = WEIGHT_CLASS_NORMAL
- spread = 24
- spread_unwielded = 30
- slot_flags = ITEM_SLOT_BELT
/obj/item/gun/ballistic/rifle/solgov
name = "SSG-669C"
diff --git a/code/modules/projectiles/guns/ballistic/shotgun.dm b/code/modules/projectiles/guns/ballistic/shotgun.dm
index 2d70bf9851bb..ab85fb9a01c4 100644
--- a/code/modules/projectiles/guns/ballistic/shotgun.dm
+++ b/code/modules/projectiles/guns/ballistic/shotgun.dm
@@ -74,7 +74,7 @@
can_be_sawn_off = TRUE
-/obj/item/gun/ballistic/shotgun/brimstone/sawoff(mob/user)
+/obj/item/gun/ballistic/shotgun/brimstone/sawoff(forced = FALSE)
. = ..()
if(.)
weapon_weight = WEAPON_MEDIUM
@@ -108,7 +108,7 @@
rack_sound = 'sound/weapons/gun/shotgun/rack_alt.ogg'
fire_delay = 0.1 SECONDS
-/obj/item/gun/ballistic/shotgun/hellfire/sawoff(mob/user)
+/obj/item/gun/ballistic/shotgun/hellfire/sawoff(forced = FALSE)
. = ..()
if(.)
var/obj/item/ammo_box/magazine/internal/tube = magazine
@@ -316,7 +316,7 @@ EMPTY_GUN_HELPER(shotgun/automatic/bulldog/inteq)
if(unique_reskin && !current_skin && user.canUseTopic(src, BE_CLOSE, NO_DEXTERITY) && (!bolt_locked))
reskin_obj(user)
-/obj/item/gun/ballistic/shotgun/doublebarrel/sawoff(mob/user)
+/obj/item/gun/ballistic/shotgun/doublebarrel/sawoff(forced = FALSE)
. = ..()
if(.)
weapon_weight = WEAPON_MEDIUM
@@ -361,7 +361,7 @@ EMPTY_GUN_HELPER(shotgun/automatic/bulldog/inteq)
item_state = "dshotgun_srm"
unique_reskin = null
-/obj/item/gun/ballistic/shotgun/doublebarrel/roumain/sawoff(mob/user)
+/obj/item/gun/ballistic/shotgun/doublebarrel/roumain/sawoff(forced = FALSE)
. = ..()
if(.)
item_state = "dshotgun_srm_sawn"
@@ -416,7 +416,7 @@ EMPTY_GUN_HELPER(shotgun/automatic/bulldog/inteq)
if(sawn_off)
. += "ishotgun_sawn"
-/obj/item/gun/ballistic/shotgun/doublebarrel/improvised/sawoff(mob/user)
+/obj/item/gun/ballistic/shotgun/doublebarrel/improvised/sawoff(forced = FALSE)
. = ..()
if(. && slung) //sawing off the gun removes the sling
new /obj/item/stack/cable_coil(get_turf(src), 10)
@@ -424,21 +424,7 @@ EMPTY_GUN_HELPER(shotgun/automatic/bulldog/inteq)
update_appearance()
/obj/item/gun/ballistic/shotgun/doublebarrel/improvised/sawn
- name = "sawn-off improvised shotgun"
- desc = "A single-shot shotgun. Better not miss."
- icon_state = "ishotgun_sawn"
- item_state = "ishotgun_sawn"
- w_class = WEIGHT_CLASS_NORMAL
sawn_off = TRUE
- slot_flags = ITEM_SLOT_BELT
-
- wield_slowdown = 0.25
- wield_delay = 0.3 SECONDS //OP? maybe
-
- spread = 8
- spread_unwielded = 15
- recoil = 3 //or not
- recoil_unwielded = 5
/obj/item/gun/ballistic/shotgun/automatic/combat/compact/compact
name = "compact compact combat shotgun"
@@ -604,7 +590,7 @@ EMPTY_GUN_HELPER(shotgun/automatic/bulldog/inteq)
balloon_alert_to_viewers("quickly racks!")
fire_delay = 0 SECONDS
-/obj/item/gun/ballistic/shotgun/flamingarrow/sawoff(mob/user)
+/obj/item/gun/ballistic/shotgun/flamingarrow/sawoff(forced = FALSE)
. = ..()
if(.)
var/obj/item/ammo_box/magazine/internal/tube = magazine
@@ -629,7 +615,7 @@ EMPTY_GUN_HELPER(shotgun/automatic/bulldog/inteq)
base_icon_state = "flamingarrow_factory"
item_state = "flamingarrow_factory"
-/obj/item/gun/ballistic/shotgun/flamingarrow/factory/sawoff(mob/user)
+/obj/item/gun/ballistic/shotgun/flamingarrow/factory/sawoff(forced = FALSE)
. = ..()
if(.)
item_state = "flamingarrow_factory_sawn"
@@ -642,7 +628,7 @@ EMPTY_GUN_HELPER(shotgun/automatic/bulldog/inteq)
icon_state = "flamingbolt"
item_state = "flamingbolt"
-/obj/item/gun/ballistic/shotgun/flamingarrow/bolt/sawoff(mob/user)
+/obj/item/gun/ballistic/shotgun/flamingarrow/bolt/sawoff(forced = FALSE)
. = ..()
if(.)
item_state = "flamingbolt_sawn"
@@ -658,7 +644,7 @@ EMPTY_GUN_HELPER(shotgun/automatic/bulldog/inteq)
sawn_desc = "A large lever-action rifle, sawn down for portability. It looks much cooler, but you should probably be using a revolver..."
mag_type = /obj/item/ammo_box/magazine/internal/shot/winchester/absolution
-/obj/item/gun/ballistic/shotgun/flamingarrow/absolution/sawoff(mob/user)
+/obj/item/gun/ballistic/shotgun/flamingarrow/absolution/sawoff(forced = FALSE)
. = ..()
if(.)
var/obj/item/ammo_box/magazine/internal/tube = magazine
@@ -690,7 +676,7 @@ EMPTY_GUN_HELPER(shotgun/automatic/bulldog/inteq)
sawn_desc = "A lever action shotgun that's been sawed down for portability. The recoil makes it mostly useless outside of point-blank range, but it hits hard for its size and, more importantly, can be flipped around stylishly."
mag_type = /obj/item/ammo_box/magazine/internal/shot/winchester/conflagration
-/obj/item/gun/ballistic/shotgun/flamingarrow/conflagration/sawoff(mob/user)
+/obj/item/gun/ballistic/shotgun/flamingarrow/conflagration/sawoff(forced = FALSE)
. = ..()
if(.)
var/obj/item/ammo_box/magazine/internal/tube = magazine
@@ -773,7 +759,7 @@ EMPTY_GUN_HELPER(shotgun/automatic/bulldog/inteq)
gun_firemodes = list(FIREMODE_SEMIAUTO)
default_firemode = FIREMODE_SEMIAUTO
-/obj/item/gun/ballistic/shotgun/doublebarrel/beacon/sawoff(mob/user)
+/obj/item/gun/ballistic/shotgun/doublebarrel/beacon/sawoff(forced = FALSE)
. = ..()
if(.)
item_state = "beacon_sawn"
@@ -796,7 +782,7 @@ EMPTY_GUN_HELPER(shotgun/automatic/bulldog/inteq)
icon_state = "beacon_factory"
item_state = "beacon_factory"
-/obj/item/gun/ballistic/shotgun/doublebarrel/beacon/factory/sawoff(mob/user)
+/obj/item/gun/ballistic/shotgun/doublebarrel/beacon/factory/sawoff(forced = FALSE)
. = ..()
if(.)
item_state = "beacon_factory_sawn"
diff --git a/code/modules/projectiles/guns/ballistic/smg.dm b/code/modules/projectiles/guns/ballistic/smg.dm
index 266c9059046a..6f52daaf2292 100644
--- a/code/modules/projectiles/guns/ballistic/smg.dm
+++ b/code/modules/projectiles/guns/ballistic/smg.dm
@@ -192,6 +192,7 @@
name = "\improper Nanotrasen Saber SMG"
desc = "A prototype full-auto 9mm submachine gun, designated 'SABR'. Has a threaded barrel for suppressors and a folding stock."
icon = 'icons/obj/guns/projectile.dmi'
+ default_attachments = list(/obj/item/attachment/foldable_stock)
icon_state = "saber"
item_state = "gun"
mag_type = /obj/item/ammo_box/magazine/smgm9mm
diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm
index c63c8358e2de..067a4bbc5d97 100644
--- a/code/modules/projectiles/guns/energy/special.dm
+++ b/code/modules/projectiles/guns/energy/special.dm
@@ -122,11 +122,12 @@
heat = 3800
usesound = list('sound/items/welder.ogg', 'sound/items/welder2.ogg')
- tool_behaviour = TOOL_WELDER
+ tool_behaviour = TOOL_DECONSTRUCT
wall_decon_damage = 200
- toolspeed = 0.7 //plasmacutters can be used as welders, and are faster than standard welders
+ toolspeed = 0.9 //plasmacutters can be used like angle grinders, and are a bit faster
internal_cell = TRUE //so you don't cheese through the need for plasma - WS EDIT
- var/charge_weld = 25 //amount of charge used up to start action (multiplied by amount) and per progress_flash_divisor ticks of welding
+ var/charge_cut = 100 //amount of charge used up to start action (multiplied by amount) and per progress_flash_divisor ticks of cutting
+ var/adv = FALSE
/obj/item/gun/energy/plasmacutter/ComponentInitialize()
. = ..()
@@ -155,16 +156,16 @@
else
..()
-// Can we weld? Plasma cutter does not use charge continuously.
+// Can we cut? Plasma cutter does not use charge continuously.
// Amount cannot be defaulted to 1: most of the code specifies 0 in the call.
/obj/item/gun/energy/plasmacutter/tool_use_check(mob/living/user, amount)
if(QDELETED(cell))
to_chat(user, "[src] does not have a cell, and cannot be used!")
return FALSE
- // Amount cannot be used if drain is made continuous, e.g. amount = 5, charge_weld = 25
+ // Amount cannot be used if drain is made continuous, e.g. amount = 5, charge_cut = 25
// Then it'll drain 125 at first and 25 periodically, but fail if charge dips below 125 even though it still can finish action
- // Alternately it'll need to drain amount*charge_weld every period, which is either obscene or makes it free for other uses
- if(amount ? cell.charge < charge_weld * amount : cell.charge < charge_weld)
+ // Alternately it'll need to drain amount*charge_cut every period, which is either obscene or makes it free for other uses
+ if(amount ? cell.charge < charge_cut * amount : cell.charge < charge_cut)
to_chat(user, "You need more charge to complete this task!")
return FALSE
@@ -186,13 +187,19 @@
return TRUE
/obj/item/gun/energy/plasmacutter/use(amount)
- return (!QDELETED(cell) && cell.use(amount ? amount * charge_weld : charge_weld))
+ return (!QDELETED(cell) && cell.use(amount ? amount * charge_cut : charge_cut))
/obj/item/gun/energy/plasmacutter/use_tool(atom/target, mob/living/user, delay, amount=1, volume=0, datum/callback/extra_checks)
if(amount)
- target.add_overlay(GLOB.welding_sparks)
+ if(adv)
+ target.add_overlay(GLOB.advanced_cutting_effect)
+ else
+ target.add_overlay(GLOB.cutting_effect)
. = ..()
- target.cut_overlay(GLOB.welding_sparks)
+ if(adv)
+ target.cut_overlay(GLOB.advanced_cutting_effect)
+ else
+ target.cut_overlay(GLOB.cutting_effect)
else
. = ..(amount=1)
@@ -201,11 +208,9 @@
icon_state = "adv_plasmacutter"
item_state = "adv_plasmacutter"
force = 15
+ wall_decon_damage = 300
ammo_type = list(/obj/item/ammo_casing/energy/plasma/adv)
- wall_decon_damage = 200
- toolspeed = 0.4
-
/obj/item/gun/energy/wormhole_projector
name = "bluespace wormhole projector"
desc = "A projector that emits high density quantum-coupled bluespace beams." //WS Edit - Any anomaly core for phazons
diff --git a/code/modules/projectiles/guns/manufacturer/clip_lanchester/ballistics.dm b/code/modules/projectiles/guns/manufacturer/clip_lanchester/ballistics.dm
index f32a2f11a508..a244b188863a 100644
--- a/code/modules/projectiles/guns/manufacturer/clip_lanchester/ballistics.dm
+++ b/code/modules/projectiles/guns/manufacturer/clip_lanchester/ballistics.dm
@@ -223,7 +223,6 @@ EMPTY_GUN_HELPER(automatic/smg/cm5)
righthand_file = 'icons/obj/guns/manufacturer/clip_lanchester/righthand.dmi'
mob_overlay_icon = 'icons/obj/guns/manufacturer/clip_lanchester/onmob.dmi'
- fire_sound = 'sound/weapons/gun/rifle/shot.ogg'
icon_state = "f4"
item_state = "f4"
show_magazine_on_sprite = TRUE
diff --git a/code/modules/projectiles/guns/manufacturer/frontier_import/ballistics.dm b/code/modules/projectiles/guns/manufacturer/frontier_import/ballistics.dm
index 90355db145dd..224712438b90 100644
--- a/code/modules/projectiles/guns/manufacturer/frontier_import/ballistics.dm
+++ b/code/modules/projectiles/guns/manufacturer/frontier_import/ballistics.dm
@@ -227,3 +227,45 @@
caliber = "12ga"
max_ammo = 40
w_class = WEIGHT_CLASS_NORMAL
+
+
+/obj/item/gun/ballistic/rocketlauncher/oneshot
+ name = "\improper Hammer"
+ desc = "A disposable rocket-propelled grenade launcher loaded with a HEDP shell."
+
+ icon = 'icons/obj/guns/manufacturer/frontier_import/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/frontier_import/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/frontier_import/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/frontier_import/onmob.dmi'
+ base_icon_state = "rpg"
+ icon_state = "rpg"
+ item_state = "rpg"
+
+ mag_type = /obj/item/ammo_box/magazine/internal/rocketlauncher/oneshot
+ fire_sound = 'sound/weapons/gun/general/rocket_launch.ogg'
+ load_sound = 'sound/weapons/gun/general/rocket_load.ogg'
+ weapon_weight = WEAPON_HEAVY
+ bolt_type = BOLT_TYPE_NO_BOLT
+
+ cartridge_wording = "rocket"
+ empty_indicator = FALSE
+ sealed_magazine = TRUE
+ manufacturer = MANUFACTURER_IMPORT
+ slot_flags = ITEM_SLOT_BACK
+
+
+/obj/item/gun/ballistic/rocketlauncher/oneshot/Initialize()
+ . = ..()
+ if(prob(1))
+ name = "\improper Mallet"
+
+/obj/item/gun/ballistic/rocketlauncher/oneshot/examine(mob/user)
+ . = ..()
+ if(!chambered)
+ . += span_warning("It has been spent, and is now useless.")
+
+/obj/item/ammo_box/magazine/internal/rocketlauncher/oneshot
+ name = "oneshot rocket launcher magazine"
+ ammo_type = /obj/item/ammo_casing/caseless/rocket/hedp
+ caliber = "84mm"
+ max_ammo = 1
diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm
index c46a4c6cb2f9..b95c3dd37ddb 100644
--- a/code/modules/projectiles/projectile/beams.dm
+++ b/code/modules/projectiles/projectile/beams.dm
@@ -37,6 +37,15 @@
muzzle_type = /obj/effect/projectile/muzzle/laser
impact_type = /obj/effect/projectile/impact/laser
+/obj/projectile/beam/laser/sharplite
+ speed = 0.4
+
+/obj/projectile/beam/laser/light
+ damage = 15
+
+/obj/projectile/beam/laser/light/sharplite
+ speed = 0.4
+
/obj/projectile/beam/laser/eoehoma
damage = 25
armour_penetration = -10
@@ -54,6 +63,9 @@
muzzle_type = /obj/effect/projectile/muzzle/heavy_laser
impact_type = /obj/effect/projectile/impact/heavy_laser
+/obj/projectile/beam/laser/heavylaser/sharplite
+ speed = 0.4
+
/obj/projectile/beam/laser/on_hit(atom/target, blocked = FALSE)
. = ..()
if(iscarbon(target))
@@ -119,9 +131,15 @@
muzzle_type = /obj/effect/projectile/muzzle/disabler
impact_type = /obj/effect/projectile/impact/disabler
+/obj/projectile/beam/disabler/sharplite
+ speed = 0.4
+
/obj/projectile/beam/disabler/weak
damage = 15
+/obj/projectile/beam/disabler/weak/sharplite
+ speed = 0.4
+
/obj/projectile/beam/disabler/weak/negative_ap
armour_penetration = -30
range = 9
@@ -148,6 +166,11 @@
return
targets_turf.IgniteTurf(rand(8,22), "blue")
+/obj/projectile/beam/pulse/sharplite_turret
+ wall_damage_flags = null
+ wall_damage_override = 0
+ speed = 0.4
+
/obj/projectile/beam/pulse/shotgun
damage = 40
diff --git a/code/modules/projectiles/projectile/bullets/rifle.dm b/code/modules/projectiles/projectile/bullets/rifle.dm
index 690f02d6b5c5..1d5d48c9b826 100644
--- a/code/modules/projectiles/projectile/bullets/rifle.dm
+++ b/code/modules/projectiles/projectile/bullets/rifle.dm
@@ -49,6 +49,13 @@
damage = 30
armour_penetration = 20
+/obj/projectile/bullet/a762_40/rubber //"rubber"
+ name = "7.62x40mm CLIP Rubber"
+ damage = 15
+ stamina = 40
+ armour_penetration = 20
+
+
//.308 WIN (M514 & GAL DMRs)
/obj/projectile/bullet/a308
@@ -57,6 +64,13 @@
damage = 30
armour_penetration = 40
+/obj/projectile/bullet/a308/rubber //"rubber"
+ name = ".308 Rubber"
+ speed = 0.3
+ damage = 25
+ stamina = 50
+ armour_penetration = 40
+
// 8x58mm caseless (SG-669)
/obj/projectile/bullet/a858
diff --git a/code/modules/projectiles/projectile/special/plasma.dm b/code/modules/projectiles/projectile/special/plasma.dm
index d957ad924572..68071bd2c557 100644
--- a/code/modules/projectiles/projectile/special/plasma.dm
+++ b/code/modules/projectiles/projectile/special/plasma.dm
@@ -1,10 +1,10 @@
/obj/projectile/plasma
name = "plasma blast"
icon_state = "plasmacutter"
- damage_type = BRUTE
- damage = 5
+ damage_type = BURN
+ damage = 15
range = 4
- dismemberment = 20
+ dismemberment = 10
/// chance that the plasmablast ruins the ore
var/slag_chance = 33
impact_effect_type = /obj/effect/temp_visual/impact_effect/purple_laser
diff --git a/code/modules/reagents/chemistry/holder.dm b/code/modules/reagents/chemistry/holder.dm
index 9eb48f11cf4d..49765fd6747b 100644
--- a/code/modules/reagents/chemistry/holder.dm
+++ b/code/modules/reagents/chemistry/holder.dm
@@ -162,7 +162,7 @@
handle_reactions()
return amount
-/// Get the name of the reagent there is the most of in this holder
+/// DEPRICATED use get_master_regent. Get the name of the reagent there is the most of in this holder
/datum/reagents/proc/get_master_reagent_name()
var/list/cached_reagents = reagent_list
var/name
@@ -175,7 +175,7 @@
return name
-/// Get the id of the reagent there is the most of in this holder
+/// DEPRICATED use get_master_regent. Get the id of the reagent there is the most of in this holder
/datum/reagents/proc/get_master_reagent_id()
var/list/cached_reagents = reagent_list
var/max_type
@@ -611,6 +611,7 @@
//Clear from relevant lists
addiction_list -= R
reagent_list -= R
+ SEND_SIGNAL(src, COMSIG_REAGENTS_DEL_REAGENT, R)
qdel(R)
update_total()
if(my_atom)
@@ -638,6 +639,8 @@
del_reagent(R.type)
if(my_atom)
my_atom.on_reagent_change(CLEAR_REAGENTS)
+
+ SEND_SIGNAL(src, COMSIG_REAGENTS_CLEAR_REAGENTS)
return 0
/**
@@ -747,6 +750,8 @@
if(my_atom)
my_atom.on_reagent_change(ADD_REAGENT)
R.on_merge(data, amount)
+
+ SEND_SIGNAL(src, COMSIG_REAGENTS_ADD_REAGENT, cached_reagents, amount, reagtemp, data, no_react)
if(!no_react)
handle_reactions()
return TRUE
@@ -765,6 +770,8 @@
update_total()
if(my_atom)
my_atom.on_reagent_change(ADD_REAGENT)
+
+ SEND_SIGNAL(src, COMSIG_REAGENTS_NEW_REAGENT, reagent, amount, reagtemp, data, no_react)
if(!no_react)
handle_reactions()
return TRUE
@@ -797,6 +804,7 @@
//and zero, to prevent removing more than the holder has stored
amount = clamp(amount, 0, R.volume)
R.volume -= amount
+ SEND_SIGNAL(src, COMSIG_REAGENTS_REM_REAGENT, A, amount)
update_total()
if(!safety)//So it does not handle reactions when it need not to
handle_reactions()
diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm
index ac1cd94b092e..8e6935766346 100644
--- a/code/modules/reagents/chemistry/machinery/chem_master.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_master.dm
@@ -337,18 +337,18 @@
reagents.trans_to(P, vol_each, transfered_by = usr)
return TRUE
if(item_type == "condimentPack")
- var/obj/item/reagent_containers/food/condiment/pack/P
+ var/obj/item/reagent_containers/condiment/pack/P
for(var/i = 0; i < amount; i++)
- P = new/obj/item/reagent_containers/food/condiment/pack(drop_location())
+ P = new/obj/item/reagent_containers/condiment/pack(drop_location())
P.originalname = name
P.name = trim("[name] pack")
P.desc = "A small condiment pack. The label says it contains [name]."
reagents.trans_to(P, vol_each, transfered_by = usr)
return TRUE
if(item_type == "condimentBottle")
- var/obj/item/reagent_containers/food/condiment/P
+ var/obj/item/reagent_containers/condiment/P
for(var/i = 0; i < amount; i++)
- P = new/obj/item/reagent_containers/food/condiment(drop_location())
+ P = new/obj/item/reagent_containers/condiment(drop_location())
P.originalname = name
P.name = trim("[name] bottle")
reagents.trans_to(P, vol_each, transfered_by = usr)
diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm
index 34ed3b7e4dfb..b6fe4370d9c5 100644
--- a/code/modules/reagents/chemistry/reagents/other_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm
@@ -1743,12 +1743,6 @@
if(istype(T))
T.MakeDry(ALL, TRUE, reac_volume * 5 SECONDS) //50 deciseconds per unit
-/datum/reagent/drying_agent/expose_obj(obj/O, reac_volume)
- if(O.type == /obj/item/clothing/shoes/galoshes)
- var/t_loc = get_turf(O)
- qdel(O)
- new /obj/item/clothing/shoes/galoshes/dry(t_loc)
-
// Virology virus food chems.
/datum/reagent/toxin/mutagen/mutagenvirusfood
@@ -2477,3 +2471,38 @@
description = "Bacteria native to the Saint-Roumain Militia home planet."
color = "#5a4f42"
taste_description = "sour"
+
+//anti rad foam
+/datum/reagent/anti_radiation_foam
+ name = "Anti-Radiation Foam"
+ description = "A tried and tested foam, used for decontaminating nuclear disasters."
+ reagent_state = LIQUID
+ color = "#A6FAFF55"
+ taste_description = "bitter, foamy awfulness."
+
+/datum/reagent/anti_radiation_foam/expose_turf(turf/open/T, reac_volume)
+ if (!istype(T))
+ return
+
+ if(reac_volume >= 1)
+ var/obj/effect/particle_effect/foam/antirad/F = (locate(/obj/effect/particle_effect/foam/antirad) in T)
+ if(!F)
+ F = new(T)
+ else if(istype(F))
+ F.lifetime = initial(F.lifetime) //the foam is what does the cleaning here
+
+/datum/reagent/anti_radiation_foam/expose_obj(obj/O, reac_volume)
+ O.wash(CLEAN_RAD)
+
+/datum/reagent/anti_radiation_foam/expose_mob(mob/living/M, method=TOUCH, reac_volume)
+ if(method in list(TOUCH, VAPOR))
+ M.radiation = M.radiation - rand(max(M.radiation * 0.95, M.radiation)) //get the hose
+ M.ExtinguishMob()
+ ..()
+
+
+/datum/reagent/anti_radiation_foam/on_mob_life(mob/living/carbon/M)
+ M.adjustToxLoss(0.5, 200)
+ M.adjust_disgust(4)
+ ..()
+ . = 1
diff --git a/code/modules/reagents/chemistry/reagents/trickwine_reagents.dm b/code/modules/reagents/chemistry/reagents/trickwine_reagents.dm
index 9f907a33b022..ff82cd185fb2 100644
--- a/code/modules/reagents/chemistry/reagents/trickwine_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/trickwine_reagents.dm
@@ -126,7 +126,7 @@
T.IgniteTurf(reac_volume)
new /obj/effect/hotspot(T, reac_volume * 1, FIRE_MINIMUM_TEMPERATURE_TO_EXIST + reac_volume * 10)
var/turf/otherT
- for(var/direction in GLOB.cardinals)
+ for(var/direction in GLOB.alldirs)
otherT = get_step(T, direction)
otherT.IgniteTurf(reac_volume)
new /obj/effect/hotspot(otherT, reac_volume * 1, FIRE_MINIMUM_TEMPERATURE_TO_EXIST + reac_volume * 10)
diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm
index fafd67305c9c..54d2fc182398 100644
--- a/code/modules/reagents/reagent_dispenser.dm
+++ b/code/modules/reagents/reagent_dispenser.dm
@@ -58,6 +58,12 @@
reagent_id = /datum/reagent/firefighting_foam
tank_volume = 500
+/obj/structure/reagent_dispensers/foamtank/antirad
+ name = "anti-radiation foam tank"
+ desc = "A tank full of decontamination foam"
+ reagent_id = /datum/reagent/anti_radiation_foam
+ tank_volume = 1000
+
/obj/structure/reagent_dispensers/fueltank
name = "fuel tank"
desc = "A tank full of industrial welding fuel. Do not consume."
diff --git a/code/modules/research/xenobiology/crossbreeding/_clothing.dm b/code/modules/research/xenobiology/crossbreeding/_clothing.dm
index cab30f0219ef..3d466983f430 100644
--- a/code/modules/research/xenobiology/crossbreeding/_clothing.dm
+++ b/code/modules/research/xenobiology/crossbreeding/_clothing.dm
@@ -30,70 +30,6 @@ Slimecrossing Armor
REMOVE_TRAIT(user, TRAIT_NOBREATH, "breathmask_[REF(src)]")
user.remove_status_effect(/datum/status_effect/rebreathing)
-/obj/item/clothing/glasses/prism_glasses
- name = "prism glasses"
- desc = "The lenses seem to glow slightly, and reflect light into dazzling colors."
- icon = 'icons/obj/slimecrossing.dmi'
- icon_state = "prismglasses"
- actions_types = list(/datum/action/item_action/change_prism_colour, /datum/action/item_action/place_light_prism)
- var/glasses_color = "#FFFFFF"
-
-/obj/item/clothing/glasses/prism_glasses/item_action_slot_check(slot)
- if(slot == ITEM_SLOT_EYES)
- return TRUE
-
-/obj/structure/light_prism
- name = "light prism"
- desc = "A shining crystal of semi-solid light. Looks fragile."
- icon = 'icons/obj/slimecrossing.dmi'
- icon_state = "lightprism"
- density = FALSE
- anchored = TRUE
- max_integrity = 10
-
-/obj/structure/light_prism/Initialize(mapload, newcolor)
- . = ..()
- color = newcolor
- set_light_color(newcolor)
- set_light(5)
-
-/obj/structure/light_prism/attack_hand(mob/user)
- to_chat(user, "You dispel [src].")
- qdel(src)
-
-/datum/action/item_action/change_prism_colour
- name = "Adjust Prismatic Lens"
- icon_icon = 'icons/obj/slimecrossing.dmi'
- button_icon_state = "prismcolor"
-
-/datum/action/item_action/change_prism_colour/Trigger()
- if(!IsAvailable())
- return
- var/obj/item/clothing/glasses/prism_glasses/glasses = target
- var/new_color = input(owner, "Choose the lens color:", "Color change",glasses.glasses_color) as color|null
- if(!new_color)
- return
- glasses.glasses_color = new_color
-
-/datum/action/item_action/place_light_prism
- name = "Fabricate Light Prism"
- icon_icon = 'icons/obj/slimecrossing.dmi'
- button_icon_state = "lightprism"
-
-/datum/action/item_action/place_light_prism/Trigger()
- if(!IsAvailable())
- return
- var/obj/item/clothing/glasses/prism_glasses/glasses = target
- if(locate(/obj/structure/light_prism) in get_turf(owner))
- to_chat(owner, "There isn't enough ambient energy to fabricate another light prism here.")
- return
- if(istype(glasses))
- if(!glasses.glasses_color)
- to_chat(owner, "The lens is oddly opaque...")
- return
- to_chat(owner, "You channel nearby light into a glowing, ethereal prism.")
- new /obj/structure/light_prism(get_turf(owner), glasses.glasses_color)
-
/obj/item/clothing/head/peaceflower
name = "heroine bud"
desc = "An extremely addictive flower, full of peace magic."
diff --git a/code/modules/research/xenobiology/crossbreeding/chilling.dm b/code/modules/research/xenobiology/crossbreeding/chilling.dm
index 9fe7857c073b..8b2aa42f0487 100644
--- a/code/modules/research/xenobiology/crossbreeding/chilling.dm
+++ b/code/modules/research/xenobiology/crossbreeding/chilling.dm
@@ -216,8 +216,7 @@ Chilling extracts:
effect_desc = "Creates a pair of Prism Glasses, which allow the wearer to place colored light crystals."
/obj/item/slimecross/chilling/pyrite/do_effect(mob/user)
- user.visible_message("[src] crystallizes into a pair of spectacles!")
- new /obj/item/clothing/glasses/prism_glasses(get_turf(user))
+ user.visible_message("[src] does nothing sorry lol!")
..()
/obj/item/slimecross/chilling/red
diff --git a/code/modules/ruins/lavalandruin_code/elephantgraveyard.dm b/code/modules/ruins/lavalandruin_code/elephantgraveyard.dm
deleted file mode 100644
index e9ca8f3d4093..000000000000
--- a/code/modules/ruins/lavalandruin_code/elephantgraveyard.dm
+++ /dev/null
@@ -1,258 +0,0 @@
-//******Decoration objects
-//***Bone statues and giant skeleton parts.
-/obj/structure/statue/bone
- anchored = TRUE
- max_integrity = 120
- material_drop_type = /obj/item/stack/sheet/bone
- impressiveness = 18 // Carved from the bones of a massive creature, it's going to be a specticle to say the least
- layer = ABOVE_ALL_MOB_LAYER
-
-/obj/structure/statue/bone/rib
- name = "collosal rib"
- desc = "It's staggering to think that something this big could have lived, let alone died."
- oreAmount = 4
- icon = 'icons/obj/statuelarge.dmi'
- icon_state = "rib"
-
-/obj/structure/statue/bone/skull
- name = "collosal skull"
- desc = "The gaping maw of a dead, titanic monster."
- oreAmount = 12
- icon = 'icons/obj/statuelarge.dmi'
- icon_state = "skull"
-
-/obj/structure/statue/bone/skull/half
- desc = "The gaping maw of a dead, titanic monster. This one is cracked in half."
- oreAmount = 6
- icon = 'icons/obj/statuelarge.dmi'
- icon_state = "skull-half"
-
-//***Wasteland floor and rock turfs here.
-/turf/open/floor/plating/asteroid/basalt/wasteland //Like a more fun version of living in Arizona.
- name = "cracked earth"
- icon = 'icons/turf/floors.dmi'
- icon_state = "wasteland"
- base_icon_state = "wasteland"
- baseturfs = /turf/open/floor/plating/asteroid/basalt/wasteland
- digResult = /obj/item/stack/ore/glass/basalt
- initial_gas_mix = LAVALAND_DEFAULT_ATMOS
- slowdown = 0.5
- floor_variance = 30
- max_icon_states = 6
-
-/turf/closed/mineral/strong/wasteland
- name = "ancient dry rock"
- color = "#B5651D"
- environment_type = "wasteland"
- turf_type = /turf/open/floor/plating/asteroid/basalt/wasteland
- baseturfs = /turf/open/floor/plating/asteroid/basalt/wasteland
- smooth_icon = 'icons/turf/walls/rock_wall.dmi'
- base_icon_state = "rock_wall"
- smoothing_flags = SMOOTH_BITMASK | SMOOTH_BORDER
-
-/turf/closed/mineral/strong/wasteland/drop_ores()
- if(prob(10))
- new /obj/item/stack/ore/iron(src, 1)
- new /obj/item/stack/ore/glass(src, 1)
- new /obj/effect/decal/remains/human/grave(src, 1)
- else
- new /obj/item/stack/sheet/bone(src, 1)
-
-//***Oil well puddles.
-/obj/structure/sink/oil_well //You're not going to enjoy bathing in this...
- name = "oil well"
- desc = "A bubbling pool of oil.This would probably be valuable, had bluespace technology not destroyed the need for fossil fuels 200 years ago."
- icon = 'icons/obj/watercloset.dmi'
- icon_state = "puddle-oil"
- dispensedreagent = /datum/reagent/fuel/oil
-
-/obj/structure/sink/oil_well/Initialize()
- .=..()
- create_reagents(20)
- reagents.add_reagent(dispensedreagent, 20)
-
-/obj/structure/sink/oil_well/attack_hand(mob/M)
- flick("puddle-oil-splash",src)
- reagents.expose(M, TOUCH, 20) //Covers target in 20u of oil.
- to_chat(M, "You touch the pool of oil, only to get oil all over yourself. It would be wise to wash this off with water.")
-
-/obj/structure/sink/oil_well/attackby(obj/item/O, mob/user, params)
- flick("puddle-oil-splash",src)
- if(O.tool_behaviour == TOOL_SHOVEL && !(flags_1&NODECONSTRUCT_1)) //attempt to deconstruct the puddle with a shovel
- to_chat(user, "You fill in the oil well with soil.")
- O.play_tool_sound(src)
- deconstruct()
- return 1
- if(istype(O, /obj/item/reagent_containers)) //Refilling bottles with oil
- var/obj/item/reagent_containers/RG = O
- if(RG.is_refillable())
- if(!RG.reagents.holder_full())
- RG.reagents.add_reagent(dispensedreagent, min(RG.volume - RG.reagents.total_volume, RG.amount_per_transfer_from_this))
- to_chat(user, "You fill [RG] from [src].")
- return TRUE
- to_chat(user, "\The [RG] is full.")
- return FALSE
- if(user.a_intent != INTENT_HARM)
- to_chat(user, "You won't have any luck getting \the [O] out if you drop it in the oil.")
- return 1
- else
- return ..()
-
-/obj/structure/sink/oil_well/drop_materials()
- new /obj/effect/decal/cleanable/oil(loc)
-
-//***Grave mounds.
-/obj/structure/closet/crate/grave
- name = "burial mound"
- desc = "A marked patch of soil, adorned with a wooden cross"
- icon_state = "grave"
- dense_when_open = TRUE
- material_drop = /obj/item/stack/ore/glass/basalt
- material_drop_amount = 5
- opened = TRUE
- anchorable = FALSE
- anchored = TRUE
- locked = TRUE
- breakout_time = 900
- cutting_tool = TOOL_SHOVEL
- var/lead_tomb = FALSE
- var/first_open = FALSE
-
-/obj/structure/closet/crate/grave/attackby(obj/item/W, mob/user, params)
- .=..()
- if(istype(W, /obj/item/screwdriver))
- if(!user.is_literate())
- to_chat(user, "You scratch illegibly on [src]!")
- return
- var/t = stripped_input(user, "What would you like the inscription to be?", name, null, 53)
- if(user.get_active_held_item() != W)
- return
- if(!user.canUseTopic(src, BE_CLOSE))
- return
- if(t)
- desc = "[t]"
- return
-
-/obj/structure/closet/crate/grave/open(mob/living/user, obj/item/S, force = FALSE)
- if(!opened)
- to_chat(user, "The ground here is too hard to dig up with your bare hands. You'll need a shovel.")
- else
- to_chat(user, "The grave has already been dug up.")
-
-/obj/structure/closet/crate/grave/tool_interact(obj/item/S, mob/living/carbon/user)
- if(user.a_intent == INTENT_HELP) //checks to attempt to dig the grave, must be done on help intent only.
- if(!opened)
- if(S.tool_behaviour == cutting_tool)
- to_chat(user, "You start start to dig open \the [src] with \the [S]...")
- if (do_after(user,20, target = src))
- opened = TRUE
- locked = TRUE
- dump_contents()
- update_appearance()
- SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "graverobbing", /datum/mood_event/graverobbing)
- if(lead_tomb == TRUE && first_open == TRUE)
- user.gain_trauma(/datum/brain_trauma/magic/stalker)
- to_chat(user, "Oh no, no no no, THEY'RE EVERYWHERE! EVERY ONE OF THEM IS EVERYWHERE!")
- first_open = FALSE
- return 1
- return 1
- else
- to_chat(user, "You can't dig up a grave with \the [S.name].")
- return 1
- else
- to_chat(user, "The grave has already been dug up.")
- return 1
-
- else if((user.a_intent != INTENT_HELP) && opened) //checks to attempt to remove the grave entirely.
- if(S.tool_behaviour == cutting_tool)
- to_chat(user, "You start to remove \the [src] with \the [S].")
- if (do_after(user,15, target = src))
- to_chat(user, "You remove \the [src] completely.")
- SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "graverobbing", /datum/mood_event/graverobbing)
- deconstruct(TRUE)
- return 1
- return
-
-/obj/structure/closet/crate/grave/bust_open()
- ..()
- opened = TRUE
- update_appearance()
- dump_contents()
- return
-
-/obj/structure/closet/crate/grave/stone
- name = "burial mound"
- desc = "A marked patch of soil, adorned with a sandstone slab"
- icon_state = "grave_lead"
-
-/obj/structure/closet/crate/grave/loot
- name = "burial mound"
- desc = "A marked patch of soil, showing signs of a burial long ago. You wouldn't disturb a grave... right?"
- opened = FALSE
-
-/obj/structure/closet/crate/grave/loot/PopulateContents() //GRAVEROBBING IS NOW A FEATURE
- ..()
- new /obj/effect/decal/remains/human/grave(src)
- switch(rand(1,7))
- if(1)
- new /obj/item/coin/gold(src)
- new /obj/item/storage/wallet(src)
- if(2)
- new /obj/item/clothing/glasses/meson(src)
- if(3)
- new /obj/item/coin/silver(src)
- new /obj/item/shovel/spade(src)
- if(4)
- new /obj/item/storage/book/bible/booze(src)
- if(5)
- new /obj/item/clothing/neck/stethoscope(src)
- new /obj/item/scalpel(src)
- new /obj/item/hemostat(src)
-
- if(6)
- new /obj/item/reagent_containers/glass/beaker(src)
- new /obj/item/clothing/glasses/science(src)
- if(7)
- new /obj/item/clothing/glasses/sunglasses(src)
- new /obj/item/clothing/mask/cigarette/rollie(src)
-
-/obj/structure/closet/crate/grave/loot/lead_researcher
- name = "ominous burial mound"
- desc = "Even in a place filled to the brim with graves, this one shows a level of preperation and planning that fills you with dread."
- icon_state = "grave_lead"
- lead_tomb = TRUE
- first_open = TRUE
-
-/obj/structure/closet/crate/grave/loot/lead_researcher/PopulateContents() //ADVANCED GRAVEROBBING
- ..()
- new /obj/effect/decal/cleanable/blood/gibs/old(src)
-
-/obj/effect/decal/remains/human/grave
- turf_loc_check = FALSE
-
-//***Fluff items for lore/intrigue
-/obj/item/paper/crumpled/muddy/fluff/elephant_graveyard
- name = "posted warning"
- desc = "It seems to be smudged with mud and... oil?"
- default_raw_text = "TO WHOM IT MAY CONCERN
This area is property of the Nanotrasen Mining Division.
Trespassing in this area is illegal, highly dangerous, and subject to several NDAs.
Please turn back now, under intergalactic law section 48-R."
-
-/obj/item/paper/crumpled/muddy/fluff/elephant_graveyard/rnd_notes
- name = "Research Findings: Day 26"
- desc = "Huh, this one page looks like it was torn out of a full book. How odd."
- icon_state = "docs_part"
- default_raw_text = "Researcher name: B--*--* J--*s.
Detailed findings:Today the camp site's cond-tion has wor--ene*. The ashst--ms keep blocking us off from le-ving the sit* for m-re supplies, and it's lo-king like we're out of pl*sma to p-wer the ge-erat*r. Can't rea-*y study c-*bon *ating with no li--ts, ya know? Da-*y's been going -*f again and ag-*n a-*ut h*w the company's left us to *ie here, but I j-s* keep tell-ng him to stop che*-in* out these damn graves. We m-y b* archaeologists, but -e sho*ld have t-e dec-**cy to know these grav-s are *-l NEW.
The rest of the page is just semantics about carbon dating methods."
-
-/obj/item/paper/crumpled/muddy/fluff/elephant_graveyard/mutiny
- name = "hastily scribbled note"
- desc = "Seems like someone was in a hurry."
- default_raw_text = "Alright, we all know that stuck up son a bitch is just doing this to keep us satisifed. Who the hell does he think he is, taking extra rations? We're OUT OF FOOD, CARL. Tomorrow at noon, we're going to try and take the ship by force. He HAS to be lying about the engine cooling down. He HAS TO BE. I'm tellin ya, with this implant I lifted off that last supply ship, I got the smarts to get us offa this shithole. Keep your knife handy carl."
-
-/obj/item/paper/fluff/ruins/elephant_graveyard/hypothesis
- name = "research document"
- desc = "Standard Nanotrasen typeface for important research documents."
- default_raw_text = "Day 9: Tenative Conclusions
While the area appears to be of significant cultural importance to the lizard race, outside of some sparce contact with native wildlife, we're yet to find any exact reasoning for the nature of this phenomenon. It seems that organic life is communally drawn to this planet as though it functions as a final resting place for intelligent life. As per company guidelines, this site shall be given the following classification: 'LZ-0271 - Elephant Graveyard'
Compiled list of Artifact findings (Currently Sent Offsite) Cultist Blade Fragments: x8 Brass Multiplicative Ore Sample: x105 Syndicate Revolutionary Leader Implant (Broken) x1 Extinct Cortical Borer Tissue Sample x1 Space Carp Fossil x3"
-
-/obj/item/paper/fluff/ruins/elephant_graveyard/final_message
- name = "important looking Note"
- desc = "This note is well written, and seems to have been put here so you'd find it."
- default_raw_text = "If you find this... you don't need to know who I am.
You need to leave this place. I dunno what shit they did to me out here, but I don't think I'm going to be making it out of here.
This place... it wears down your psyche. The other researchers out here laughed it off but... They were the first to go.
One by one they started turning on each other. The more they found out, the more they started fighting and arguing... As I speak now, I had to... I wound up having to put most of my men down. I know what I had to do, and I know there's no way left for me to live with myself. If anyone ever finds this, just don't touch the graves.
DO NOT. TOUCH. THE GRAVES. Don't be a dumbass, like we all were."
diff --git a/code/modules/spells/spell_types/lichdom.dm b/code/modules/spells/spell_types/lichdom.dm
index 38e2f0df145e..e7d4a1e39884 100644
--- a/code/modules/spells/spell_types/lichdom.dm
+++ b/code/modules/spells/spell_types/lichdom.dm
@@ -67,8 +67,6 @@
H.dropItemToGround(H.w_uniform)
H.dropItemToGround(H.wear_suit)
H.dropItemToGround(H.head)
- H.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe/black(H), ITEM_SLOT_OCLOTHING)
- H.equip_to_slot_or_del(new /obj/item/clothing/head/wizard/black(H), ITEM_SLOT_HEAD)
H.equip_to_slot_or_del(new /obj/item/clothing/under/color/black(H), ITEM_SLOT_ICLOTHING)
// you only get one phylactery.
@@ -133,8 +131,6 @@
lich.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal/magic(lich), ITEM_SLOT_FEET)
lich.equip_to_slot_or_del(new /obj/item/clothing/under/color/black(lich), ITEM_SLOT_ICLOTHING)
- lich.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe/black(lich), ITEM_SLOT_OCLOTHING)
- lich.equip_to_slot_or_del(new /obj/item/clothing/head/wizard/black(lich), ITEM_SLOT_HEAD)
lich.real_name = mind.name
mind.transfer_to(lich)
diff --git a/code/modules/surgery/organic_steps.dm b/code/modules/surgery/organic_steps.dm
index 8959a7f99715..39fb1d71b258 100644
--- a/code/modules/surgery/organic_steps.dm
+++ b/code/modules/surgery/organic_steps.dm
@@ -152,13 +152,17 @@
implements = list(
TOOL_SAW = 100,
/obj/item/melee/axe/fire = 50,
+ /obj/item/gear_handle/anglegrinder = 50,
/obj/item/melee/arm_blade = 40,
/obj/item/hatchet = 40,
/obj/item/melee/knife/butcher = 33,
+ /obj/item/gun/energy/plasmacutter = 30,
/obj/item = 10) //10% success (sort of) with any sharp item with a force>=10
time = 5.4 SECONDS
preop_sound = list(
/obj/item/circular_saw = 'sound/surgery/saw.ogg',
+ /obj/item/gear_handle/anglegrinder = 'sound/surgery/saw.ogg',
+ /obj/item/gun/energy/plasmacutter = 'sound/weapons/plasma_cutter.ogg',
/obj/item/melee/arm_blade = 'sound/surgery/scalpel1.ogg',
/obj/item/melee/axe/fire = 'sound/surgery/scalpel1.ogg',
/obj/item/hatchet = 'sound/surgery/scalpel1.ogg',
diff --git a/code/modules/surgery/revival.dm b/code/modules/surgery/revival.dm
index 13e4e3b784c6..7aef39fb5451 100644
--- a/code/modules/surgery/revival.dm
+++ b/code/modules/surgery/revival.dm
@@ -42,7 +42,7 @@
. = TRUE
if(istype(tool, /obj/item/shockpaddles))
var/obj/item/shockpaddles/S = tool
- if((S.req_defib && !S.defib.powered) || !S.wielded || S.cooldown || S.busy)
+ if((S.req_defib && !S.defib.powered) || !HAS_TRAIT(S, TRAIT_WIELDED) || S.cooldown || S.busy)
to_chat(user, "You need to wield both paddles, and [S.defib] must be powered!")
return FALSE
if(istype(tool, /obj/item/melee/baton))
diff --git a/code/modules/unit_tests/icons/worn_icons.dm b/code/modules/unit_tests/icons/worn_icons.dm
index eb2d84b73f68..3dba4d7c8e03 100644
--- a/code/modules/unit_tests/icons/worn_icons.dm
+++ b/code/modules/unit_tests/icons/worn_icons.dm
@@ -78,7 +78,7 @@
spacer = "\n\t"
if(cached_slot_flags & ITEM_SLOT_EYES)
- icon_file = 'icons/mob/clothing/eyes.dmi'
+ icon_file = 'icons/mob/clothing/eyes/eyes.dmi'
if(!(icon_state in icon_states(icon_file, 1)))
already_warned_icons += icon_state
fail_reasons += "[spacer][item_path] using invalid [mob_overlay_state ? "mob_overlay_state" : "icon_state"], \"[icon_state]\" in '[icon_file]'[match_message]"
diff --git a/code/modules/uplink/uplink_items.dm b/code/modules/uplink/uplink_items.dm
index 1f7bdb089f07..0923ba1cc70e 100644
--- a/code/modules/uplink/uplink_items.dm
+++ b/code/modules/uplink/uplink_items.dm
@@ -1200,16 +1200,6 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
item = /obj/item/codespeak_manual/unlimited
cost = 3
-/datum/uplink_item/stealthy_tools/combatbananashoes
- name = "Combat Banana Shoes"
- desc = "While making the wearer immune to most slipping attacks like regular combat clown shoes, these shoes \
- can generate a large number of synthetic banana peels as the wearer walks, slipping up would-be pursuers. They also \
- squeak significantly louder."
- item = /obj/item/clothing/shoes/clown_shoes/banana_shoes/combat
- cost = 6
- surplus = 0
- include_modes = list(/datum/game_mode/nuclear/clown_ops)
-
/datum/uplink_item/stealthy_tools/emplight
name = "EMP Flashlight"
desc = "A small, self-recharging, short-ranged EMP device disguised as a working flashlight. \
@@ -1866,15 +1856,6 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
cost = 12
restricted_roles = list("Chemist", "Chief Medical Officer")
-/datum/uplink_item/role_restricted/reverse_bear_trap
- name = "Reverse Bear Trap"
- desc = "An ingenious execution device worn on (or forced onto) the head. Arming it starts a 1-minute kitchen timer mounted on the bear trap. When it goes off, the trap's jaws will \
- violently open, instantly killing anyone wearing it by tearing their jaws in half. To arm, attack someone with it while they're not wearing headgear, and you will force it onto their \
- head after three seconds uninterrupted."
- cost = 5
- item = /obj/item/reverse_bear_trap
- restricted_roles = list("Clown")
-
/datum/uplink_item/role_restricted/laser_arm
name = "Laser Arm Implant"
desc = "An implant that grants you a recharging laser gun inside your arm. Weak to EMPs. Comes with a syndicate autosurgeon for immediate self-application."
diff --git a/code/modules/vehicles/cars/clowncar.dm b/code/modules/vehicles/cars/clowncar.dm
index e9addbd2d5bf..1df30ff3be9b 100644
--- a/code/modules/vehicles/cars/clowncar.dm
+++ b/code/modules/vehicles/cars/clowncar.dm
@@ -111,8 +111,7 @@
var/randomnum = rand(1,6)
switch(randomnum)
if(1)
- visible_message("[user] presses one of the colorful buttons on [src], and a special banana peel drops out of it.")
- new /obj/item/grown/bananapeel/specialpeel(loc)
+ visible_message("[user] presses one of the colorful buttons on [src], and doesn't do anything. Oops.")
if(2)
visible_message("[user] presses one of the colorful buttons on [src], and unknown chemicals flood out of it.")
var/datum/reagents/R = new/datum/reagents(300)
diff --git a/code/modules/vending/autodrobe.dm b/code/modules/vending/autodrobe.dm
index 367c309d59a1..413b0238ce5d 100644
--- a/code/modules/vending/autodrobe.dm
+++ b/code/modules/vending/autodrobe.dm
@@ -7,8 +7,6 @@
product_slogans = "Dress for success!;Suited and booted!;It's show time!;Why leave style up to fate? Use AutoDrobe!"
vend_reply = "Thank you for using AutoDrobe!"
products = list(
- /obj/item/clothing/suit/chickensuit = 1,
- /obj/item/clothing/head/chicken = 1,
/obj/item/clothing/under/costume/gladiator = 1,
/obj/item/clothing/head/helmet/gladiator = 1,
/obj/item/clothing/under/rank/command/captain/suit = 1,
@@ -29,16 +27,11 @@
/obj/item/clothing/head/that = 1,
/obj/item/clothing/under/costume/kilt = 1,
/obj/item/clothing/head/beret = 1,
- /obj/item/clothing/head/beret/vintage = 1,
- /obj/item/clothing/head/beret/archaic = 1,
/obj/item/clothing/accessory/waistcoat = 1,
- /obj/item/clothing/glasses/monocle =1,
- /obj/item/clothing/head/bowler = 1,
/obj/item/cane = 1,
/obj/item/clothing/under/suit/sl = 1,
/obj/item/clothing/mask/fakemoustache = 1,
/obj/item/clothing/suit/bio_suit/plaguedoctorsuit = 1,
- /obj/item/clothing/head/plaguedoctorhat = 1,
/obj/item/clothing/mask/gas/plaguedoctor = 1,
/obj/item/clothing/suit/toggle/owlwings = 1,
/obj/item/clothing/under/costume/owl = 1,
@@ -53,17 +46,9 @@
/obj/item/clothing/head/bandana = 1,
/obj/item/clothing/head/bandana = 1,
/obj/item/clothing/head/trapper = 1,
- /obj/item/clothing/suit/imperium_monk = 1,
/obj/item/clothing/mask/gas/cyborg = 1,
- /obj/item/clothing/suit/chaplainsuit/holidaypriest = 1,
- /obj/item/clothing/suit/chaplainsuit/whiterobe = 1,
- /obj/item/clothing/head/wizard/marisa/fake = 1,
- /obj/item/clothing/suit/wizrobe/marisa/fake = 1,
/obj/item/clothing/under/dress/sundress = 1,
- /obj/item/clothing/head/witchwig = 1,
/obj/item/staff/broom = 1,
- /obj/item/clothing/suit/wizrobe/fake = 1,
- /obj/item/clothing/head/wizard/fake = 1,
/obj/item/staff = 3,
/obj/item/clothing/under/rank/civilian/mime/sexy = 1,
/obj/item/clothing/under/rank/civilian/mime/skirt = 1,
@@ -77,12 +62,6 @@
/obj/item/clothing/mask/rat/tribal = 1,
/obj/item/clothing/mask/rat = 1,
/obj/item/clothing/suit/apron/overalls = 1,
- /obj/item/clothing/head/rabbitears =1,
- /obj/item/clothing/head/sombrero = 1,
- /obj/item/clothing/head/sombrero/green = 1,
- /obj/item/clothing/suit/poncho = 1,
- /obj/item/clothing/suit/poncho/green = 1,
- /obj/item/clothing/suit/poncho/red = 1,
/obj/item/clothing/head/maidheadband = 1,
/obj/item/clothing/under/costume/maid = 1,
/obj/item/clothing/gloves/maid = 1,
@@ -90,29 +69,15 @@
/obj/item/clothing/under/rank/civilian/janitor/maid = 1,
/obj/item/clothing/glasses/cold=1,
/obj/item/clothing/glasses/heat=1,
- /obj/item/clothing/suit/whitedress = 1,
- /obj/item/clothing/head/jester = 1,
/obj/item/clothing/suit/hooded/carp_costume = 1,
- /obj/item/clothing/suit/hooded/ian_costume = 1,
- /obj/item/clothing/suit/hooded/bee_costume = 1,
/obj/item/clothing/suit/snowman = 1,
/obj/item/clothing/head/snowman = 1,
/obj/item/clothing/mask/joy = 1,
- /obj/item/clothing/head/cueball = 1,
/obj/item/clothing/under/suit/white_on_white = 1,
/obj/item/clothing/under/costume/sailor = 1,
- /obj/item/clothing/head/delinquent = 1,
/obj/item/clothing/head/wig/random = 3,
- /obj/item/clothing/head/shrine_wig = 1,
- /obj/item/clothing/suit/shrine_maiden = 1,
- /obj/item/clothing/suit/changshan_red = 1,
- /obj/item/clothing/suit/changshan_blue = 1,
- /obj/item/clothing/suit/cheongsam_red = 1,
- /obj/item/clothing/suit/cheongsam_blue = 1,
/obj/item/gohei = 1,
/obj/item/clothing/suit/judgerobe = 1,
- /obj/item/clothing/head/powdered_wig = 1,
- /obj/item/clothing/glasses/sunglasses/garb = 2,
/obj/item/clothing/glasses/blindfold = 1,
/obj/item/clothing/mask/muzzle = 2)
premium = list(
@@ -121,10 +86,8 @@
/obj/item/clothing/head/helmet/roman/fake = 1,
/obj/item/clothing/head/helmet/roman/legionnaire/fake = 1,
/obj/item/clothing/under/costume/roman = 1,
- /obj/item/clothing/shoes/roman = 1,
/obj/item/shield/riot/roman/fake = 1,
- /obj/item/skub = 1,
- /obj/item/clothing/suit/hooded/mysticrobe = 1)
+ /obj/item/skub = 1)
refill_canister = /obj/item/vending_refill/autodrobe
default_price = 180
extra_price = 360
diff --git a/code/modules/vending/clothesmate.dm b/code/modules/vending/clothesmate.dm
index e9eef49a0e3a..0c16b36902e2 100644
--- a/code/modules/vending/clothesmate.dm
+++ b/code/modules/vending/clothesmate.dm
@@ -16,14 +16,10 @@
/obj/item/clothing/head/beanie/yellow = 3,
/obj/item/clothing/head/beanie/orange = 3,
/obj/item/clothing/head/beanie/cyan = 3,
- /obj/item/clothing/head/beanie/christmas = 3,
/obj/item/clothing/head/beanie/striped = 3,
/obj/item/clothing/head/beanie/stripedred = 3,
/obj/item/clothing/head/beanie/stripedblue = 3,
/obj/item/clothing/head/beanie/stripedgreen = 3,
- /obj/item/clothing/head/beanie/rasta = 3,
- /obj/item/clothing/head/kippah = 3,
- /obj/item/clothing/head/taqiyahred = 3,
/obj/item/clothing/gloves/fingerless = 2,
/obj/item/clothing/neck/scarf/pink = 3,
/obj/item/clothing/neck/scarf/red = 3,
@@ -85,9 +81,6 @@
/obj/item/clothing/accessory/waistcoat = 1,
/obj/item/clothing/head/that = 1,
/obj/item/clothing/head/fedora = 1,
- /obj/item/clothing/glasses/monocle = 1,
- /obj/item/clothing/head/sombrero = 1,
- /obj/item/clothing/suit/poncho = 1,
/obj/item/clothing/under/costume/kilt = 1,
/obj/item/clothing/under/dress/sundress = 1,
/obj/item/clothing/under/dress/striped = 1,
@@ -112,12 +105,10 @@
/obj/item/storage/belt/fannypack/black = 2,
/obj/item/clothing/suit/jacket/letterman_syndie = 1,
/obj/item/clothing/under/costume/jabroni = 1,
- /obj/item/clothing/suit/vapeshirt = 1,
/obj/item/clothing/under/costume/geisha = 1)
premium = list(
/obj/item/clothing/under/suit/checkered = 1,
/obj/item/clothing/suit/jacket/leather = 1,
- /obj/item/clothing/suit/jacket/leather/overcoat = 1,
/obj/item/clothing/neck/necklace/dope = 3,
/obj/item/clothing/suit/jacket/letterman_nanotrasen = 1,
/obj/item/instrument/piano_synth/headphones/spacepods = 1)
diff --git a/code/modules/vending/drinnerware.dm b/code/modules/vending/drinnerware.dm
index 18b8fd522aab..0dc0102c91ef 100644
--- a/code/modules/vending/drinnerware.dm
+++ b/code/modules/vending/drinnerware.dm
@@ -8,11 +8,11 @@
/obj/item/reagent_containers/glass/bowl = 20,
/obj/item/kitchen/fork = 6,
/obj/item/reagent_containers/food/drinks/drinkingglass = 8,
- /obj/item/reagent_containers/food/condiment/pack/ketchup = 5,
- /obj/item/reagent_containers/food/condiment/pack/hotsauce = 5,
- /obj/item/reagent_containers/food/condiment/pack/astrotame = 5,
- /obj/item/reagent_containers/food/condiment/saltshaker = 5,
- /obj/item/reagent_containers/food/condiment/peppermill = 5,
+ /obj/item/reagent_containers/condiment/pack/ketchup = 5,
+ /obj/item/reagent_containers/condiment/pack/hotsauce = 5,
+ /obj/item/reagent_containers/condiment/pack/astrotame = 5,
+ /obj/item/reagent_containers/condiment/saltshaker = 5,
+ /obj/item/reagent_containers/condiment/peppermill = 5,
/obj/item/clothing/suit/apron/chef = 2,
/obj/item/kitchen/rollingpin = 2,
/obj/item/melee/knife/kitchen = 2,
diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm
index 4686c12da1ad..2bef026cebff 100644
--- a/code/modules/vending/wardrobes.dm
+++ b/code/modules/vending/wardrobes.dm
@@ -163,8 +163,7 @@
/obj/item/clothing/head/soft/black = 2,
/obj/item/clothing/mask/bandana/skull = 2
)
- contraband = list(/obj/item/clothing/suit/hooded/enginseer = 2, // WS edit: enginsineer robes
- /obj/item/organ/tongue/robot = 2)
+ contraband = list(/obj/item/organ/tongue/robot = 2)
refill_canister = /obj/item/vending_refill/wardrobe/robo_wardrobe
extra_price = 300
/obj/item/vending_refill/wardrobe/robo_wardrobe
@@ -282,7 +281,7 @@
vend_reply = "Thank you for using the ChefDrobe!"
products = list(/obj/item/clothing/under/suit/waiter = 2,
/obj/item/radio/headset/headset_srv = 2,
- /obj/item/clothing/head/beret/service = 2, //WS edit - berets
+ /obj/item/clothing/head/beret/service = 2,
/obj/item/clothing/accessory/waistcoat = 2,
/obj/item/clothing/suit/apron/chef = 3,
/obj/item/clothing/head/soft/mime = 2,
@@ -291,10 +290,8 @@
/obj/item/clothing/suit/toggle/chef = 1,
/obj/item/clothing/under/rank/civilian/chef = 1,
/obj/item/clothing/under/rank/civilian/chef/skirt = 2,
- ///obj/item/clothing/under/rank/chef = 3,//WS edit - Better security jumpsuit sprites
/obj/item/clothing/head/chefhat = 1,
/obj/item/clothing/under/shorts/cookjorts = 2,
- /obj/item/clothing/shoes/cookflops = 2,
/obj/item/reagent_containers/glass/rag = 1,
/obj/item/clothing/accessory/armband/med = 4,
/obj/item/clothing/suit/hooded/wintercoat = 2)
@@ -381,22 +378,10 @@
/obj/item/clothing/under/rank/civilian/chaplain = 1,
/obj/item/clothing/under/rank/civilian/chaplain/skirt = 2,
/obj/item/clothing/shoes/sneakers/black = 1,
- /obj/item/clothing/suit/chaplainsuit/nun = 1,
- /obj/item/clothing/head/nun_hood = 1,
- /obj/item/clothing/suit/chaplainsuit/holidaypriest = 1,
- /obj/item/clothing/suit/hooded/chaplainsuit/monkhabit = 1,
/obj/item/storage/fancy/candle_box = 2,
- /obj/item/clothing/head/kippah = 3,
- /obj/item/clothing/suit/chaplainsuit/whiterobe = 1,
- /obj/item/clothing/head/taqiyahwhite = 1,
- /obj/item/clothing/head/taqiyahred = 3,
- /obj/item/clothing/suit/chaplainsuit/monkrobeeast = 1,
- /obj/item/clothing/accessory/armband/med = 4,
- /obj/item/clothing/head/beanie/rasta = 1)
+ /obj/item/clothing/accessory/armband/med = 4)
contraband = list(/obj/item/toy/plush/plushvar = 1,
/obj/item/toy/plush/narplush = 1)
- premium = list(/obj/item/clothing/suit/chaplainsuit/bishoprobe = 1,
- /obj/item/clothing/head/bishopmitre = 1)
refill_canister = /obj/item/vending_refill/wardrobe/chap_wardrobe
/obj/item/vending_refill/wardrobe/chap_wardrobe
machine_name = "ChapDrobe"
@@ -432,8 +417,7 @@
/obj/item/clothing/shoes/sneakers/white = 2,
/obj/item/clothing/suit/toggle/labcoat/genetics = 2,
/obj/item/clothing/accessory/armband/medblue = 4,
- /obj/item/storage/backpack/genetics = 2,
- /obj/item/storage/backpack/satchel/gen = 2)
+ /obj/item/storage/backpack/genetics = 2)
refill_canister = /obj/item/vending_refill/wardrobe/gene_wardrobe
/obj/item/vending_refill/wardrobe/gene_wardrobe
machine_name = "GeneDrobe"
@@ -454,7 +438,6 @@
/obj/item/clothing/accessory/armband/hydro = 4,
/obj/item/storage/backpack/satchel/vir = 2)
contraband = list(/obj/item/clothing/suit/bio_suit/plaguedoctorsuit = 1,
- /obj/item/clothing/head/plaguedoctorhat = 1,
/obj/item/clothing/mask/gas/plaguedoctor = 1)
refill_canister = /obj/item/vending_refill/wardrobe/viro_wardrobe
/obj/item/vending_refill/wardrobe/viro_wardrobe
diff --git a/html/changelogs/AutoChangeLog-pr-3430.yml b/html/changelogs/AutoChangeLog-pr-3430.yml
new file mode 100644
index 000000000000..d464fc2f8fc4
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-3430.yml
@@ -0,0 +1,4 @@
+author: thgvr
+changes:
+ - {imageadd: Some backpack sprites for Kepori}
+delete-after: true
diff --git a/html/changelogs/AutoChangeLog-pr-3440.yml b/html/changelogs/AutoChangeLog-pr-3440.yml
deleted file mode 100644
index 6736a4cc4659..000000000000
--- a/html/changelogs/AutoChangeLog-pr-3440.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-author: Jedi-Toothpaste
-changes:
- - {rscadd: Firelocks to the Valor-Class' Doors}
- - {rscadd: Lighting to dark areas on the Valor-Class' Doors}
- - {rscadd: New areas on the Valor-Class to seperate rooms}
- - {rscadd: Added APC for the Surgical Area}
-delete-after: true
diff --git a/html/changelogs/AutoChangeLog-pr-3443.yml b/html/changelogs/AutoChangeLog-pr-3443.yml
deleted file mode 100644
index 3fd19b120e6d..000000000000
--- a/html/changelogs/AutoChangeLog-pr-3443.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: PositiveEntropy
-changes:
- - {imageadd: Adjusts the inner part of the normal rabbit ears.}
-delete-after: true
diff --git a/html/changelogs/AutoChangeLog-pr-3481.yml b/html/changelogs/AutoChangeLog-pr-3481.yml
new file mode 100644
index 000000000000..d4489159840d
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-3481.yml
@@ -0,0 +1,4 @@
+author: thgvr
+changes:
+ - {imageadd: Shrunk down the sprite of guncases}
+delete-after: true
diff --git a/html/changelogs/AutoChangeLog-pr-3486.yml b/html/changelogs/AutoChangeLog-pr-3486.yml
new file mode 100644
index 000000000000..2ec418ab330d
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-3486.yml
@@ -0,0 +1,5 @@
+author: Aquidu
+changes:
+ - {code_imp: Changes flameless ration heaters to "small" items}
+ - {code_imp: Adds flameless ration heaters to the ration pack item whitelist.}
+delete-after: true
diff --git a/html/changelogs/archive/2024-09.yml b/html/changelogs/archive/2024-09.yml
index a90afebaaf94..52b3cbfbf679 100644
--- a/html/changelogs/archive/2024-09.yml
+++ b/html/changelogs/archive/2024-09.yml
@@ -190,3 +190,31 @@
zimon9:
- rscadd: Added fruit puree to vegan rations
- rscdel: Removed pizza crackers from vegan rations
+2024-09-27:
+ Jedi-Toothpaste:
+ - rscadd: Firelocks to the Valor-Class' Doors
+ - rscadd: Lighting to dark areas on the Valor-Class' Doors
+ - rscadd: New areas on the Valor-Class to seperate rooms
+ - rscadd: Added APC for the Surgical Area
+ PositiveEntropy:
+ - imageadd: Adjusts the inner part of the normal rabbit ears.
+2024-09-28:
+ Sadhorizon:
+ - rscadd: Added a fax machine to the Dwayne-class.
+ SomeguyManperson:
+ - bugfix: legion skulls will no longer check if they should rise up and consume
+ their owner if they are ownerless
+2024-09-29:
+ fighterslam:
+ - balance: Modernizes and slightly buffs the Ranger.
+2024-09-30:
+ Bjarl:
+ - rscdel: The Elephant Graveyard ruin has been taken out back
+ - bugfix: m90 posters are real again
+ FalloutFalcon:
+ - bugfix: sawnoff weapons made from init now function correctly
+ - bugfix: condiment packs are no longer invisible and missing names
+ MassiveMen:
+ - rscadd: Added the fire axe to the black market uplink
+ Thera-Pissed:
+ - rscadd: New wasteplanet ruin, the abandoned Miskilamo shipbreaking yard!
diff --git a/html/changelogs/archive/2024-10.yml b/html/changelogs/archive/2024-10.yml
new file mode 100644
index 000000000000..ef18854c4aac
--- /dev/null
+++ b/html/changelogs/archive/2024-10.yml
@@ -0,0 +1,71 @@
+2024-10-01:
+ Erika Fox:
+ - rscadd: Anti-Radiation Foam is now available at the outpost
+ - code_imp: Fireaxe cabinets have been repathed, and now function as a more general
+ cabinet object. please report any inconsistencies with behavior
+ Sadhorizon:
+ - tweak: You can now put knives in secbelts and the subtypes of secbelts.
+ - bugfix: You can now fit all knives in mining webbings.
+ SomeguyManperson:
+ - bugfix: hallucinations can no longer be permanent unless treated
+2024-10-02:
+ Bjarl:
+ - rscadd: One-Shot Rocket Launcher. A quick solution to an armored problem.
+ - rscadd: You can now scribble profane things onto the tube of your rocket launcher.
+ Use this power wisely.
+ - imageadd: 'Rye: A sprite for a one-shot rocket launcher'
+ generalthrax:
+ - balance: Molotov cocktails now create turf fires
+ - balance: Hearthwine now create turf fires in a 3x3 area
+ tmtmtl30, Thgvr:
+ - rscadd: Added bunkbeds, which can now be crafted with metal or placed by mappers.
+ - bugfix: Beds facing alternate directions now correctly support people buckling
+ to them and bedsheets being placed on top of them.
+2024-10-03:
+ Bjarl:
+ - bugfix: defibs now work again.
+2024-10-05:
+ Bjarl:
+ - rscadd: A cargo ship happened to lose an entire crate of Hammer Rocket Launchers
+ while travelling through the system. We have reason to believe they're probably
+ on sale now.
+ - rscdel: you can no longer purchase PML-9s on the black market.
+ Gristlebee, Rye-Rice, INFRARED_BARON:
+ - rscadd: Inteq Gygax and mech charges
+ - rscadd: Paladin shield backlash
+ - bugfix: Durand shield blocking all projectiles
+ - imageadd: Inteq Gygax sprites
+ Jedi-Toothpaste:
+ - rscadd: Added extra intercoms in high traffic areas on the Valor Class
+ - rscadd: Added Firelocks underneath the Cargo-Bay Doors on the Valor Class
+ - rscadd: Air Alarms, Scrubbers and Vents to every applicable room
+ MemeSnorfer:
+ - rscadd: Three new Elzuose horn types. Cervid, Prong, and Brow
+ PositiveEntropy:
+ - imageadd: Waste Planet Turfs Now Look Much More Refined!
+ Thera-Pissed:
+ - rscadd: pipe dispenser UI is now similar to rapid pipe dispenser UI.
+ generalthrax:
+ - balance: Replace red insuls with yellow insuls in syndicate toolboxes
+ zimon9:
+ - bugfix: fixed the waste and scrubber gas reclamation filters on the colossus
+2024-10-06:
+ Apogee-dev:
+ - balance: removed one recruit slot from the vaquero
+ - rscadd: Added Nanotrasen Harrier-class cruiser
+ - rscdel: Removed Osprey-class cruiser
+ - rscdel: Removed Skipper-class cruiser
+ - balance: increased mudskipper limit to 2
+ - balance: cut a deckhand slot from kilo
+ Bjarl:
+ - rscadd: IRMG engineers have rolled new turrets out into the frontier. Please report
+ back on their effectiveness. Unless you have been shot. Then you should be dead.
+ - rscadd: Sharplite has produced a line of turrets for Nanotrasen, which is now
+ mounting them on relevant vessels.
+ Sadhorizon:
+ - bugfix: Komodo Bridge Officer is now actually an officer.
+ SomeguyManperson:
+ - rscdel: missions will no longer request capturing ice demons
+ Thera-Pissed:
+ - rscadd: angle grinders for salvage
+ - rscadd: reworks plasma cutters for salvage
diff --git a/icons/effects/cutting_effect.dmi b/icons/effects/cutting_effect.dmi
new file mode 100644
index 000000000000..e8b4abeec5d0
Binary files /dev/null and b/icons/effects/cutting_effect.dmi differ
diff --git a/icons/effects/effects.dmi b/icons/effects/effects.dmi
index 0aa256c631e4..bb63eb2b7f0e 100644
Binary files a/icons/effects/effects.dmi and b/icons/effects/effects.dmi differ
diff --git a/icons/mecha/inteq_gygax.dmi b/icons/mecha/inteq_gygax.dmi
new file mode 100644
index 000000000000..08105d783ab9
Binary files /dev/null and b/icons/mecha/inteq_gygax.dmi differ
diff --git a/icons/mecha/mecha.dmi b/icons/mecha/mecha.dmi
index 9b9c2b479c7b..2993487cb850 100644
Binary files a/icons/mecha/mecha.dmi and b/icons/mecha/mecha.dmi differ
diff --git a/icons/mecha/mecha_equipment.dmi b/icons/mecha/mecha_equipment.dmi
index 5e08a834a892..76549c15a3e0 100644
Binary files a/icons/mecha/mecha_equipment.dmi and b/icons/mecha/mecha_equipment.dmi differ
diff --git a/icons/mob/actions/actions_flightsuit.dmi b/icons/mob/actions/actions_flightsuit.dmi
deleted file mode 100644
index 3121c243555f..000000000000
Binary files a/icons/mob/actions/actions_flightsuit.dmi and /dev/null differ
diff --git a/icons/mob/clothing/back.dmi b/icons/mob/clothing/back.dmi
index 5508bc67523c..5ca5b6bd045d 100644
Binary files a/icons/mob/clothing/back.dmi and b/icons/mob/clothing/back.dmi differ
diff --git a/icons/mob/clothing/back/backpacks.dmi b/icons/mob/clothing/back/backpacks.dmi
new file mode 100644
index 000000000000..7138b440a4ad
Binary files /dev/null and b/icons/mob/clothing/back/backpacks.dmi differ
diff --git a/icons/mob/clothing/back/backpacks_kepori.dmi b/icons/mob/clothing/back/backpacks_kepori.dmi
new file mode 100644
index 000000000000..557ee29267fd
Binary files /dev/null and b/icons/mob/clothing/back/backpacks_kepori.dmi differ
diff --git a/icons/mob/clothing/eyes.dmi b/icons/mob/clothing/eyes.dmi
deleted file mode 100644
index 687d4965b32a..000000000000
Binary files a/icons/mob/clothing/eyes.dmi and /dev/null differ
diff --git a/icons/mob/clothing/eyes/eyes.dmi b/icons/mob/clothing/eyes/eyes.dmi
new file mode 100644
index 000000000000..5c83d2dcfbc3
Binary files /dev/null and b/icons/mob/clothing/eyes/eyes.dmi differ
diff --git a/icons/mob/clothing/feet.dmi b/icons/mob/clothing/feet.dmi
index 3246bbb24de2..ec9850144f7b 100644
Binary files a/icons/mob/clothing/feet.dmi and b/icons/mob/clothing/feet.dmi differ
diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi
index f207b2bfd826..d2970f6b9ead 100644
Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ
diff --git a/icons/mob/clothing/head/winterhood.dmi b/icons/mob/clothing/head/winterhood.dmi
index 321896641390..cc3fd8a4e5d4 100644
Binary files a/icons/mob/clothing/head/winterhood.dmi and b/icons/mob/clothing/head/winterhood.dmi differ
diff --git a/icons/mob/clothing/suit.dmi b/icons/mob/clothing/suit.dmi
index ca1eb949aa40..b595f529b7ee 100644
Binary files a/icons/mob/clothing/suit.dmi and b/icons/mob/clothing/suit.dmi differ
diff --git a/icons/mob/clothing/suits/hooded.dmi b/icons/mob/clothing/suits/hooded.dmi
index e1f98d991357..7d2f53a13b06 100644
Binary files a/icons/mob/clothing/suits/hooded.dmi and b/icons/mob/clothing/suits/hooded.dmi differ
diff --git a/icons/mob/clothing/suits/spacesuits.dmi b/icons/mob/clothing/suits/spacesuits.dmi
index da5075195992..1a0f5001b34a 100644
Binary files a/icons/mob/clothing/suits/spacesuits.dmi and b/icons/mob/clothing/suits/spacesuits.dmi differ
diff --git a/icons/mob/ethereal_parts.dmi b/icons/mob/ethereal_parts.dmi
index 14e0c51037fb..c5d0c9b45f78 100644
Binary files a/icons/mob/ethereal_parts.dmi and b/icons/mob/ethereal_parts.dmi differ
diff --git a/icons/mob/inhands/equipment/gear_handle_lefthand.dmi b/icons/mob/inhands/equipment/gear_handle_lefthand.dmi
new file mode 100644
index 000000000000..169f91ce6eba
Binary files /dev/null and b/icons/mob/inhands/equipment/gear_handle_lefthand.dmi differ
diff --git a/icons/mob/inhands/equipment/gear_handle_righthand.dmi b/icons/mob/inhands/equipment/gear_handle_righthand.dmi
new file mode 100644
index 000000000000..172f18e6095a
Binary files /dev/null and b/icons/mob/inhands/equipment/gear_handle_righthand.dmi differ
diff --git a/icons/mob/species/kepori/onmob_back_kepori.dmi b/icons/mob/species/kepori/onmob_back_kepori.dmi
new file mode 100644
index 000000000000..98218916f7c0
Binary files /dev/null and b/icons/mob/species/kepori/onmob_back_kepori.dmi differ
diff --git a/icons/obj/clothing/back/backpacks.dmi b/icons/obj/clothing/back/backpacks.dmi
new file mode 100644
index 000000000000..01e2c1d6923b
Binary files /dev/null and b/icons/obj/clothing/back/backpacks.dmi differ
diff --git a/icons/obj/clothing/eyes/eyes.dmi b/icons/obj/clothing/eyes/eyes.dmi
new file mode 100644
index 000000000000..63b92986ca50
Binary files /dev/null and b/icons/obj/clothing/eyes/eyes.dmi differ
diff --git a/icons/obj/clothing/flightsuit.dmi b/icons/obj/clothing/flightsuit.dmi
deleted file mode 100644
index e08e74db1cec..000000000000
Binary files a/icons/obj/clothing/flightsuit.dmi and /dev/null differ
diff --git a/icons/obj/clothing/glasses.dmi b/icons/obj/clothing/glasses.dmi
deleted file mode 100644
index a021b79db58c..000000000000
Binary files a/icons/obj/clothing/glasses.dmi and /dev/null differ
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index 402ce131a988..52d9036e0211 100644
Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ
diff --git a/icons/obj/clothing/head/winterhood.dmi b/icons/obj/clothing/head/winterhood.dmi
index aa212eb48da2..c89538ccb0b3 100644
Binary files a/icons/obj/clothing/head/winterhood.dmi and b/icons/obj/clothing/head/winterhood.dmi differ
diff --git a/icons/obj/clothing/shoes.dmi b/icons/obj/clothing/shoes.dmi
index 5a162a969132..00e1da5d54ea 100644
Binary files a/icons/obj/clothing/shoes.dmi and b/icons/obj/clothing/shoes.dmi differ
diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi
index d325c5098a73..e3ceffdb3329 100644
Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ
diff --git a/icons/obj/clothing/suits/hooded.dmi b/icons/obj/clothing/suits/hooded.dmi
index 6d449550ad43..7c3a70a0624c 100644
Binary files a/icons/obj/clothing/suits/hooded.dmi and b/icons/obj/clothing/suits/hooded.dmi differ
diff --git a/icons/obj/guncase.dmi b/icons/obj/guncase.dmi
index 4941b965f2f8..83b5292a5cfd 100644
Binary files a/icons/obj/guncase.dmi and b/icons/obj/guncase.dmi differ
diff --git a/icons/obj/guncase_48x32.dmi b/icons/obj/guncase_48x32.dmi
deleted file mode 100644
index b5dc20bc64e5..000000000000
Binary files a/icons/obj/guncase_48x32.dmi and /dev/null differ
diff --git a/icons/obj/guns/manufacturer/frontier_import/48x32.dmi b/icons/obj/guns/manufacturer/frontier_import/48x32.dmi
index 2f2db3d07ad5..be95cfa90c14 100644
Binary files a/icons/obj/guns/manufacturer/frontier_import/48x32.dmi and b/icons/obj/guns/manufacturer/frontier_import/48x32.dmi differ
diff --git a/icons/obj/guns/manufacturer/frontier_import/lefthand.dmi b/icons/obj/guns/manufacturer/frontier_import/lefthand.dmi
index eb6c552627ee..e34bf3995dfd 100644
Binary files a/icons/obj/guns/manufacturer/frontier_import/lefthand.dmi and b/icons/obj/guns/manufacturer/frontier_import/lefthand.dmi differ
diff --git a/icons/obj/guns/manufacturer/frontier_import/onmob.dmi b/icons/obj/guns/manufacturer/frontier_import/onmob.dmi
index 274aa3a15036..e0b05e0ec63f 100644
Binary files a/icons/obj/guns/manufacturer/frontier_import/onmob.dmi and b/icons/obj/guns/manufacturer/frontier_import/onmob.dmi differ
diff --git a/icons/obj/guns/manufacturer/frontier_import/righthand.dmi b/icons/obj/guns/manufacturer/frontier_import/righthand.dmi
index 406c40e66ac6..30eeaa12d4e9 100644
Binary files a/icons/obj/guns/manufacturer/frontier_import/righthand.dmi and b/icons/obj/guns/manufacturer/frontier_import/righthand.dmi differ
diff --git a/icons/obj/item/gear_packs.dmi b/icons/obj/item/gear_packs.dmi
new file mode 100644
index 000000000000..76fb94bd4ff3
Binary files /dev/null and b/icons/obj/item/gear_packs.dmi differ
diff --git a/icons/obj/mining.dmi b/icons/obj/mining.dmi
index 337e3bf6d8da..efffc5cebb4a 100644
Binary files a/icons/obj/mining.dmi and b/icons/obj/mining.dmi differ
diff --git a/icons/obj/objects.dmi b/icons/obj/objects.dmi
index 1b156b9294f9..8479c100f1b0 100644
Binary files a/icons/obj/objects.dmi and b/icons/obj/objects.dmi differ
diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi
index 9ff37a4b7e0c..5353677357cf 100644
Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ
diff --git a/icons/turf/floors.dmi b/icons/turf/floors.dmi
index 398d5550f810..1dbb3a101fae 100644
Binary files a/icons/turf/floors.dmi and b/icons/turf/floors.dmi differ
diff --git a/shiptest.dme b/shiptest.dme
index 3de6baf8f3a5..187540e66a26 100644
--- a/shiptest.dme
+++ b/shiptest.dme
@@ -162,6 +162,7 @@
#include "code\__DEFINES\dcs\helpers.dm"
#include "code\__DEFINES\dcs\signals\signals.dm"
#include "code\__DEFINES\dcs\signals\signals_mod.dm"
+#include "code\__DEFINES\dcs\signals\signals_reagent.dm"
#include "code\__DEFINES\dcs\signals\signals_ship.dm"
#include "code\__DEFINES\dcs\signals\signals_storage.dm"
#include "code\__DEFINES\dcs\signals\signals_mob\signals_mob_carbon.dm"
@@ -669,12 +670,13 @@
#include "code\datums\elements\lazy_fishing_spot.dm"
#include "code\datums\elements\light_blocking.dm"
#include "code\datums\elements\mobappearance.dm"
-#include "code\datums\elements\point_of_interest.dm"
#include "code\datums\elements\plant_backfire.dm"
+#include "code\datums\elements\point_of_interest.dm"
#include "code\datums\elements\renamemob.dm"
#include "code\datums\elements\selfknockback.dm"
#include "code\datums\elements\snail_crawl.dm"
#include "code\datums\elements\squish.dm"
+#include "code\datums\elements\tool_bang.dm"
#include "code\datums\elements\tool_flash.dm"
#include "code\datums\elements\turf_transparency.dm"
#include "code\datums\elements\undertile.dm"
@@ -1174,6 +1176,7 @@
#include "code\game\objects\items\etherealdiscoball.dm"
#include "code\game\objects\items\extinguisher.dm"
#include "code\game\objects\items\flamethrower.dm"
+#include "code\game\objects\items\gear_packs.dm"
#include "code\game\objects\items\gift.dm"
#include "code\game\objects\items\granters.dm"
#include "code\game\objects\items\handcuffs.dm"
@@ -1246,7 +1249,6 @@
#include "code\game\objects\items\devices\powersink.dm"
#include "code\game\objects\items\devices\pressureplates.dm"
#include "code\game\objects\items\devices\quantum_keycard.dm"
-#include "code\game\objects\items\devices\reverse_bear_trap.dm"
#include "code\game\objects\items\devices\scanners.dm"
#include "code\game\objects\items\devices\sensor_device.dm"
#include "code\game\objects\items\devices\spyglasses.dm"
@@ -1374,6 +1376,8 @@
#include "code\game\objects\structures\artstuff.dm"
#include "code\game\objects\structures\barsigns.dm"
#include "code\game\objects\structures\bedsheet_bin.dm"
+#include "code\game\objects\structures\cabinet.dm"
+#include "code\game\objects\structures\cabinet_types.dm"
#include "code\game\objects\structures\catwalk.dm"
#include "code\game\objects\structures\crateshelf.dm"
#include "code\game\objects\structures\curtains.dm"
@@ -1387,7 +1391,6 @@
#include "code\game\objects\structures\extinguisher.dm"
#include "code\game\objects\structures\false_walls.dm"
#include "code\game\objects\structures\fence.dm"
-#include "code\game\objects\structures\fireaxe.dm"
#include "code\game\objects\structures\fireplace.dm"
#include "code\game\objects\structures\flora.dm"
#include "code\game\objects\structures\fluff.dm"
@@ -1471,6 +1474,7 @@
#include "code\game\objects\structures\crates_lockers\closets\secure\security.dm"
#include "code\game\objects\structures\crates_lockers\crates\bins.dm"
#include "code\game\objects\structures\crates_lockers\crates\critter.dm"
+#include "code\game\objects\structures\crates_lockers\crates\graves.dm"
#include "code\game\objects\structures\crates_lockers\crates\large.dm"
#include "code\game\objects\structures\crates_lockers\crates\secure.dm"
#include "code\game\objects\structures\crates_lockers\crates\wooden.dm"
@@ -1985,7 +1989,6 @@
#include "code\modules\clothing\masks\hailer.dm"
#include "code\modules\clothing\masks\miscellaneous.dm"
#include "code\modules\clothing\neck\_neck.dm"
-#include "code\modules\clothing\outfits\event.dm"
#include "code\modules\clothing\outfits\plasmaman.dm"
#include "code\modules\clothing\outfits\standard.dm"
#include "code\modules\clothing\outfits\vv_outfit.dm"
@@ -2006,7 +2009,6 @@
#include "code\modules\clothing\outfits\factions\solgov.dm"
#include "code\modules\clothing\outfits\factions\syndicate.dm"
#include "code\modules\clothing\shoes\_shoes.dm"
-#include "code\modules\clothing\shoes\bananashoes.dm"
#include "code\modules\clothing\shoes\colour.dm"
#include "code\modules\clothing\shoes\magboots.dm"
#include "code\modules\clothing\shoes\miscellaneous.dm"
@@ -2396,6 +2398,7 @@
#include "code\modules\mining\ores_coins.dm"
#include "code\modules\mining\satchel_ore_boxdm.dm"
#include "code\modules\mining\shelters.dm"
+#include "code\modules\mining\equipment\angle_grinder.dm"
#include "code\modules\mining\equipment\explorer_gear.dm"
#include "code\modules\mining\equipment\kinetic_crusher.dm"
#include "code\modules\mining\equipment\lazarus_injector.dm"
@@ -3266,7 +3269,6 @@
#include "code\modules\ruins\icemoonruin_code\library.dm"
#include "code\modules\ruins\icemoonruin_code\wrath.dm"
#include "code\modules\ruins\lavalandruin_code\biodome_winter.dm"
-#include "code\modules\ruins\lavalandruin_code\elephantgraveyard.dm"
#include "code\modules\ruins\lavalandruin_code\puzzle.dm"
#include "code\modules\ruins\lavalandruin_code\surface.dm"
#include "code\modules\ruins\lavalandruin_code\syndicate_base.dm"
diff --git a/sound/weapons/anglegrinder.ogg b/sound/weapons/anglegrinder.ogg
new file mode 100644
index 000000000000..c0bc5b593a18
Binary files /dev/null and b/sound/weapons/anglegrinder.ogg differ
diff --git a/tgui/packages/tgui-dev-server/package.json b/tgui/packages/tgui-dev-server/package.json
index a026558a47a1..1a0f4c972244 100644
--- a/tgui/packages/tgui-dev-server/package.json
+++ b/tgui/packages/tgui-dev-server/package.json
@@ -4,7 +4,7 @@
"version": "4.3.1",
"type": "module",
"dependencies": {
- "axios": "^1.6.0",
+ "axios": "^1.7.4",
"glob": "^7.1.7",
"source-map": "^0.7.3",
"stacktrace-parser": "^0.1.10",
diff --git a/tgui/packages/tgui/interfaces/PipeDispenser.js b/tgui/packages/tgui/interfaces/PipeDispenser.js
new file mode 100644
index 000000000000..61798b67306a
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/PipeDispenser.js
@@ -0,0 +1,193 @@
+import { classes } from 'common/react';
+import { useBackend, useLocalState } from '../backend';
+import {
+ Box,
+ Button,
+ ColorBox,
+ Flex,
+ LabeledList,
+ Section,
+ Tabs,
+} from '../components';
+import { Window } from '../layouts';
+
+const ROOT_CATEGORIES = ['Atmospherics', 'Disposals', 'Transit Tubes'];
+
+const ICON_BY_CATEGORY_NAME = {
+ 'Atmospherics': 'wrench',
+ 'Disposals': 'trash-alt',
+ 'Transit Tubes': 'bus',
+ 'Pipes': 'grip-lines',
+ 'Disposal Pipes': 'grip-lines',
+ 'Devices': 'microchip',
+ 'Heat Exchange': 'thermometer-half',
+ 'Station Equipment': 'microchip',
+};
+
+const PAINT_COLORS = {
+ grey: '#bbbbbb',
+ amethyst: '#a365ff',
+ blue: '#4466ff',
+ brown: '#b26438',
+ cyan: '#48eae8',
+ dark: '#808080',
+ green: '#1edd00',
+ orange: '#ffa030',
+ purple: '#b535ea',
+ red: '#ff3333',
+ violet: '#6e00f6',
+ yellow: '#ffce26',
+};
+
+export const PipeDispenser = (props, context) => {
+ const { act, data } = useBackend(context);
+ const {
+ category: rootCategoryIndex,
+ categories = [],
+ selected_color,
+ piping_layer,
+ mode,
+ } = data;
+ const previews = data.preview_rows.flatMap((row) => row.previews);
+ const [categoryName, setCategoryName] = useLocalState(
+ context,
+ 'categoryName'
+ );
+ const shownCategory =
+ categories.find((category) => category.cat_name === categoryName) ||
+ categories[0];
+ return (
+
+
+
+
+
+ {ROOT_CATEGORIES.map((categoryName, i) => (
+
+
+
+
+
+ {selected_color}
+
+ {Object.keys(PAINT_COLORS).map((colorName) => (
+
+ act('color', {
+ paint_color: colorName,
+ })
+ }
+ />
+ ))}
+
+
+
+
+
+
+ {rootCategoryIndex === 0 && (
+
+ {[1, 2, 3, 4, 5].map((layer) => (
+
+ act('piping_layer', {
+ piping_layer: layer,
+ })
+ }
+ />
+ ))}
+
+ )}
+
+ {previews.map((preview) => (
+
+ ))}
+
+
+
+
+
+
+ {categories.map((category, i) => (
+ setCategoryName(category.cat_name)}
+ >
+ {category.cat_name}
+
+ ))}
+
+ {shownCategory?.recipes.map((recipe) => (
+
+ act('pipe_type', {
+ pipe_type: recipe.pipe_index,
+ category: shownCategory.cat_name,
+ })
+ }
+ />
+ ))}
+
+
+
+
+
+ );
+};
diff --git a/tgui/yarn.lock b/tgui/yarn.lock
index bdf58e167804..6bb17b2fc675 100644
--- a/tgui/yarn.lock
+++ b/tgui/yarn.lock
@@ -2951,14 +2951,14 @@ __metadata:
languageName: node
linkType: hard
-"axios@npm:^1.6.0":
- version: 1.6.1
- resolution: "axios@npm:1.6.1"
+"axios@npm:^1.7.4":
+ version: 1.7.5
+ resolution: "axios@npm:1.7.5"
dependencies:
- follow-redirects: ^1.15.0
+ follow-redirects: ^1.15.6
form-data: ^4.0.0
proxy-from-env: ^1.1.0
- checksum: 573f03f59b7487d54551b16f5e155d1d130ad4864ed32d1da93d522b78a57123b34e3bde37f822a65ee297e79f1db840f9ad6514addff50d3cbf5caeed39e8dc
+ checksum: 2859fe01437cf133eee35571abc1d4b5224bb13e530e66cb3581ca226e170541dd5eef9f46abb41592cee0a2f54930c9e4978354e0cf1064748fc20d9a05e9d5
languageName: node
linkType: hard
@@ -4814,13 +4814,13 @@ __metadata:
languageName: node
linkType: hard
-"follow-redirects@npm:^1.15.0":
- version: 1.15.4
- resolution: "follow-redirects@npm:1.15.4"
+"follow-redirects@npm:^1.15.6":
+ version: 1.15.6
+ resolution: "follow-redirects@npm:1.15.6"
peerDependenciesMeta:
debug:
optional: true
- checksum: e178d1deff8b23d5d24ec3f7a94cde6e47d74d0dc649c35fc9857041267c12ec5d44650a0c5597ef83056ada9ea6ca0c30e7c4f97dbf07d035086be9e6a5b7b6
+ checksum: a62c378dfc8c00f60b9c80cab158ba54e99ba0239a5dd7c81245e5a5b39d10f0c35e249c3379eae719ff0285fff88c365dd446fab19dee771f1d76252df1bbf5
languageName: node
linkType: hard
@@ -8940,7 +8940,7 @@ resolve@^2.0.0-next.3:
version: 0.0.0-use.local
resolution: "tgui-dev-server@workspace:packages/tgui-dev-server"
dependencies:
- axios: ^1.6.0
+ axios: ^1.7.4
glob: ^7.1.7
source-map: ^0.7.3
stacktrace-parser: ^0.1.10