The Universal Colossal Battleship Linear Weapon Mount or simply "Universal Linear Mount" (USM), is a linear rail system that can be commonly found in many ships created in the Etherbor Lihmona Shipyards. Attachment of a weapon to a Universal Linear Mount requires the use of a Linear Mount Tool Facility. An engineering marvel are the massive machines at these facilities that effortlessly handle these systems on a regular basis. Most shipyards dealing in Kalixcian Colossal Arms will also have such a facility to install the weapons.
+
+
The installation of weapons into a Universal Linear Mount is rather simplistic. A weapon must first be delivered to the Linear Mount Tool Facility, where it will be manually loaded onto the SMT's massive cargo lift. The SMT is then extended out around the weapon, and the weapon is then secured into the SMT with engaging locks. The next step is to bring the ship into the facility, placed just in line with the SMT. The weapon is then lined up with the Universal Linear Mount and slotted into place. The USM's hardware locks are then engaged, the weapon is welded to the USM, and electronic systems are hooked into the ship's computer systems. The weapons are then hooked into an independent power bank to prevent overdraw from main ship power banks, and prevent explosive backsurge.
+
+
Common Colossal Battleship Weapons compatible with the Universal Linear Mount include the following:
+
+
HORUS Colossal Energy Cannon
+
+ A massive laser cannon capable of variable strength, and sustained fire up to 10 seconds. One of the highest power draws of all colossal warship guns. Multiple independent power banks are required to fire this gun, with the lowest power setting drawing 4MW/s, and the highest drawing 16MW/s.
+
+
SUPERNOVA High-Performance Giant Rail Cannon
+
+ While not as powerful as the QUASAR SMITER Colossal Rail Cannon, this gun is one of the most commonly produced at the Lihmona Shipyards. Fires a 9/5ths meter "Huge Slug" ordinance, accelerated by 1MW draw pair of electromagnetic accelerators.
+
+
Massive Ordinance Missile Array (B.O.M.B)
+
+ A popular choice amongst bomber ships, the "Massive Ordinance Missile Array" or "M.O.M.A" for short, is a rapid fire missile array chain launcher. Capable of firing up to 4 missiles per second, these weapons often find their homes on ships with exceedingly large cargo bays built for holding large hoards of heavy ordinance.
+
+
QUASAR SMITER Colossal Rail Cannon
+
+ The largest gun ever produced by the Lihmona Shipyards, the QUASAR SMITER is a truly terrifying tool of destruction. A gun requiring 3 Universal Linear Mounts to hold, this gun finds its place only on the largest ships in the PGFN and PGFMC. This gun fires 18/5ths meter gigantic "DEMON SLUG"s at a rate of approximately 1 shot every 5 minutes. The power draw of such a massive weapon sings to the tun of 50MW of power per round.
+
+ "}
diff --git a/code/game/machinery/shuttle/turbine.dm b/code/game/machinery/shuttle/turbine.dm
new file mode 100644
index 000000000000..7d310d37cd30
--- /dev/null
+++ b/code/game/machinery/shuttle/turbine.dm
@@ -0,0 +1,436 @@
+// TURBINE v2 AKA rev4407 Engine reborn!
+
+// How to use it? - Mappers
+//
+// This is a very good power generating mechanism. All you need is a blast furnace with soaring flames and output.
+// Not everything is included yet so the turbine can run out of fuel quiet quickly. The best thing about the turbine is that even
+// though something is on fire that passes through it, it won't be on fire as it passes out of it. So the exhaust fumes can still
+// containt unreacted fuel - plasma and oxygen that needs to be filtered out and re-routed back. This of course requires smart piping
+// For a computer to work with the turbine the compressor requires a comp_id matching with the turbine computer's id. This will be
+// subjected to a change in the near future mind you. Right now this method of generating power is a good backup but don't expect it
+// become a main power source unless some work is done. Have fun. At 50k RPM it generates 60k power. So more than one turbine is needed!
+//
+// - Numbers
+//
+// Example setup S - sparker
+// B - Blast doors into space for venting
+// *BBB****BBB* C - Compressor
+// S CT * T - Turbine
+// * ^ * * V * D - Doors with firedoor
+// **|***D**|** ^ - Fuel feed (Not vent, but a gas outlet)
+// | | V - Suction vent (Like the ones in atmos
+//
+
+
+/obj/machinery/power/compressor
+ name = "compressor"
+ desc = "The compressor stage of a gas turbine generator."
+ icon = 'icons/obj/atmospherics/components/turbine.dmi'
+ icon_state = "compressor"
+ density = TRUE
+ resistance_flags = FIRE_PROOF
+ CanAtmosPass = ATMOS_PASS_DENSITY
+ use_power = NO_POWER_USE // powered by gas flow
+ interacts_with_air = TRUE
+ circuit = /obj/item/circuitboard/machine/power_compressor
+ var/obj/machinery/power/shuttle/engine/turbine/turbine
+ var/datum/gas_mixture/gas_contained
+ var/starter = 0
+ var/rpm = 0
+ var/rpmtarget = 0
+ var/capacity = 1e6
+ var/comp_id = 0
+ var/efficiency = 1
+ var/intake_ratio = 0.1 // might add a way to adjust this in-game later
+
+/obj/machinery/power/shuttle/engine/turbine/lavaland
+ destroy_output = TRUE
+
+/obj/machinery/power/compressor/Destroy()
+ SSair.stop_processing_machine(src)
+ if (turbine && turbine.compressor == src)
+ turbine.compressor = null
+ if(isopenturf(loc))
+ loc.assume_air(gas_contained)
+ loc.air_update_turf()
+ turbine = null
+ return ..()
+
+/obj/machinery/power/shuttle/engine/turbine
+ name = "gas turbine generator"
+ desc = "A gas turbine used for backup power generation."
+ icon = 'icons/obj/atmospherics/components/turbine.dmi'
+ icon_state = "turbine"
+ density = TRUE
+ resistance_flags = FIRE_PROOF
+ CanAtmosPass = ATMOS_PASS_DENSITY
+ use_power = NO_POWER_USE // powered by gas flow
+ interacts_with_air = TRUE
+ circuit = /obj/item/circuitboard/machine/power_turbine
+ thrust = 0 // no thrust by default
+ icon_state_closed = "turbine"
+ icon_state_open = "turbine"
+ icon_state_off = "turbine"
+ var/opened = 0
+ var/obj/machinery/power/compressor/compressor
+ var/lastgen = 0
+ var/productivity = 1
+ var/destroy_output = FALSE //Destroy the output gas instead of actually outputting it. Used on lavaland to prevent cooking the zlevel
+
+/obj/machinery/power/shuttle/engine/turbine/Destroy()
+ SSair.stop_processing_machine(src)
+ if (compressor && compressor.turbine == src)
+ compressor.turbine = null
+ compressor = null
+ return ..()
+
+// the inlet stage of the gas turbine electricity generator
+
+/obj/machinery/power/compressor/Initialize(mapload)
+ . = ..()
+ // The inlet of the compressor is the direction it faces
+ gas_contained = new
+ SSair.start_processing_machine(src, mapload)
+ locate_machinery()
+ if(!turbine)
+ obj_break()
+ return INITIALIZE_HINT_LATELOAD
+
+/obj/machinery/power/compressor/LateInitialize()
+ . = ..()
+ var/turf/comp_turf = get_turf(src)
+ comp_turf.ImmediateCalculateAdjacentTurfs() // turbine blocks atmos so update the turf it's on or stuff breaks
+
+#define COMPFRICTION 5e5
+
+/obj/machinery/power/compressor/locate_machinery()
+ if(turbine)
+ return
+ turbine = locate() in get_step(src, turn(dir, 180))
+ if(turbine)
+ set_machine_stat(machine_stat & ~BROKEN)
+ turbine.locate_machinery()
+ else
+ turbine = null
+ obj_break()
+
+/obj/machinery/power/compressor/RefreshParts()
+ var/E = 0
+ for(var/obj/item/stock_parts/manipulator/M in component_parts)
+ E += M.rating
+ efficiency = max(E / 6, 1)
+
+/obj/machinery/power/compressor/examine(mob/user)
+ . = ..()
+ if(in_range(user, src) || isobserver(user))
+ . += "The status display reads: Efficiency at [efficiency*100]%."
+
+/obj/machinery/power/compressor/attackby(obj/item/I, mob/user, params)
+ if(default_deconstruction_screwdriver(user, initial(icon_state), initial(icon_state), I))
+ return
+
+ if(default_change_direction_wrench(user, I))
+ if(turbine)
+ to_chat(user, "Turbine connected.")
+ set_machine_stat(machine_stat & ~BROKEN)
+ else
+ to_chat(user, "Turbine not connected.")
+ return
+
+ default_deconstruction_crowbar(I)
+
+/obj/machinery/power/compressor/default_deconstruction_screwdriver(mob/user, icon_state_open, icon_state_closed, obj/item/I)
+ . = ..()
+ if(panel_open)
+ set_machine_stat(machine_stat | MAINT)
+ else
+ set_machine_stat(machine_stat & ~MAINT)
+
+//update when moved or changing direction
+/obj/machinery/power/compressor/setDir(newdir)
+ . = ..()
+ locate_machinery()
+
+/obj/machinery/power/compressor/Move(atom/newloc, direct, glide_size_override)
+ . = ..()
+ locate_machinery()
+
+/obj/machinery/power/compressor/process(delta_time)
+ return
+
+/obj/machinery/power/compressor/process_atmos(delta_time)
+ // RPM function to include compression friction - be advised that too low/high of a compfriction value can make things screwy
+ rpm -= 1
+ rpm = (0.9 * rpm) + (0.1 * rpmtarget)
+ rpm = min(rpm, (COMPFRICTION*efficiency)/2)
+ rpm = max(0, rpm - (rpm**2)/(COMPFRICTION*efficiency))
+
+ update_overlays()
+
+ if(!turbine || (turbine.machine_stat & BROKEN))
+ locate_machinery() // try to find the other part if we somehow got disconnected
+
+ if((machine_stat & (BROKEN|MAINT)) || !starter) // if we didn't find it...
+ rpmtarget = 0
+ return
+
+ var/turf/inturf = get_step(src, dir)
+ var/datum/gas_mixture/environment = inturf.return_air()
+ var/external_pressure = environment.return_pressure()
+ var/pressure_delta = external_pressure - gas_contained.return_pressure()
+
+ // Equalize the gas between the environment and the internal gas mix
+ if(pressure_delta > 0)
+ var/datum/gas_mixture/removed = environment.remove_ratio((1 - ((1 - intake_ratio)**delta_time)) * pressure_delta / (external_pressure * 2)) // silly math to keep it consistent with delta_time
+ gas_contained.merge(removed)
+ inturf.air_update_turf()
+
+/obj/machinery/power/compressor/update_overlays()
+ . = ..()
+ if(rpm>50000)
+ add_overlay(mutable_appearance(icon, "comp-o4", FLY_LAYER))
+ else if(rpm>10000)
+ add_overlay(mutable_appearance(icon, "comp-o3", FLY_LAYER))
+ else if(rpm>2000)
+ add_overlay(mutable_appearance(icon, "comp-o2", FLY_LAYER))
+ else if(rpm>500)
+ add_overlay(mutable_appearance(icon, "comp-o1", FLY_LAYER))
+
+// These are crucial to working of a turbine - the stats modify the power output. TurbGenQ modifies how much raw energy can you get from
+// rpms, TurbGenG modifies the shape of the curve - the lower the value the less straight the curve is.
+
+#define TURBGENQ 100000
+#define TURBGENG 0.5
+#define POWER_TO_THRUST 0.001 // power production to thrust ratio
+
+/obj/machinery/power/shuttle/engine/turbine/Initialize(mapload)
+ . = ..()
+ SSair.start_processing_machine(src, mapload)
+ locate_machinery()
+ if(!compressor)
+ obj_break()
+ connect_to_network()
+ return INITIALIZE_HINT_LATELOAD
+
+/obj/machinery/power/shuttle/engine/turbine/LateInitialize()
+ . = ..()
+ var/turf/comp_turf = get_turf(src)
+ comp_turf.ImmediateCalculateAdjacentTurfs() // turbine blocks atmos so update the turf it's on or stuff breaks
+
+/obj/machinery/power/shuttle/engine/turbine/RefreshParts()
+ var/P = 0
+ for(var/obj/item/stock_parts/capacitor/C in component_parts)
+ P += C.rating
+ productivity = P / 6
+
+/obj/machinery/power/shuttle/engine/turbine/examine(mob/user)
+ . = ..()
+ if(in_range(user, src) || isobserver(user))
+ . += "The status display reads: Productivity at [productivity*100]%."
+
+/obj/machinery/power/shuttle/engine/turbine/locate_machinery()
+ if(compressor)
+ return
+ compressor = locate() in get_step(src, turn(dir, 180))
+ if(compressor)
+ set_machine_stat(machine_stat & ~BROKEN)
+ compressor.locate_machinery()
+ else
+ compressor = null
+ obj_break()
+
+/obj/machinery/power/shuttle/engine/turbine/process(delta_time)
+ add_avail(lastgen) // add power in process() so it doesn't update power output separately from the rest of the powernet (bad)
+ update_overlays()
+
+/obj/machinery/power/shuttle/engine/turbine/process_atmos(delta_time)
+ if(!compressor)
+ set_machine_stat(BROKEN)
+ locate_machinery() // try to find the missing piece
+
+ if(machine_stat & (BROKEN|MAINT)) // we're only running half a turbine, don't continue
+ return
+
+ // This is the power generation function. If anything is needed it's good to plot it in EXCEL before modifying
+ // the TURBGENQ and TURBGENG values
+
+ lastgen = ((compressor.rpm / TURBGENQ)**TURBGENG) * TURBGENQ * productivity
+ thrust = lastgen * POWER_TO_THRUST // second law
+
+ var/turf/outturf = get_step(src, dir)
+ if(!LAZYLEN(outturf.atmos_adjacent_turfs))
+ compressor.rpmtarget = 0
+ return
+
+ // Move gas from the compressor to the outlet
+ var/datum/gas_mixture/environment = outturf.return_air()
+ var/internal_pressure = compressor.gas_contained.return_pressure()
+ var/pressure_delta = internal_pressure - environment.return_pressure()
+
+ // Now set the compressor's RPM target based on how much gas is flowing through
+ compressor.rpmtarget = max(0, pressure_delta * compressor.gas_contained.return_volume() / (R_IDEAL_GAS_EQUATION * 4))
+
+ // Equalize the gas between the internal gas mix and the environment
+ if(pressure_delta > 0)
+ var/datum/gas_mixture/removed = compressor.gas_contained.remove_ratio(pressure_delta / (internal_pressure * 2))
+ if(destroy_output)
+ qdel(removed)
+ return
+ outturf.assume_air(removed)
+ outturf.air_update_turf()
+
+// Return the current thrust amount
+/obj/machinery/power/shuttle/engine/turbine/burn_engine(percentage, deltatime)
+ return thrust * deltatime * (percentage / 100)
+
+// Return the current power output
+/obj/machinery/power/shuttle/engine/turbine/return_fuel()
+ return lastgen
+
+// Return the maximum power output
+/obj/machinery/power/shuttle/engine/turbine/return_fuel_cap()
+ return ((COMPFRICTION*(compressor ? compressor.efficiency : 1) / (TURBGENQ*4))**TURBGENG) * TURBGENQ * productivity
+
+// Return the maximum power output
+/obj/machinery/power/shuttle/engine/turbine/update_engine()
+ if(!(flags_1 & INITIALIZED_1))
+ return FALSE
+ thruster_active = !panel_open && compressor
+ return thruster_active
+
+// If it works, put an overlay that it works!
+/obj/machinery/power/shuttle/engine/turbine/update_overlays()
+ . = ..()
+ if(lastgen > 100)
+ add_overlay(mutable_appearance(icon, "turb-o", FLY_LAYER))
+
+/obj/machinery/power/shuttle/engine/turbine/attackby(obj/item/I, mob/user, params)
+ if(default_deconstruction_screwdriver(user, initial(icon_state), initial(icon_state), I))
+ return
+
+ if(default_change_direction_wrench(user, I))
+ if(compressor)
+ to_chat(user, "Compressor connected.")
+ else
+ to_chat(user, "Compressor not connected.")
+ obj_break()
+ return
+
+ default_deconstruction_crowbar(I)
+
+/obj/machinery/power/shuttle/engine/turbine/default_deconstruction_screwdriver(mob/user, icon_state_open, icon_state_closed, obj/item/I)
+ . = ..()
+ if(panel_open)
+ set_machine_stat(machine_stat | MAINT)
+ else
+ set_machine_stat(machine_stat & ~MAINT)
+
+// update if it moves or changes direction
+/obj/machinery/power/shuttle/engine/turbine/setDir(newdir)
+ . = ..()
+ locate_machinery()
+
+/obj/machinery/power/shuttle/engine/turbine/Move(atom/newloc, direct, glide_size_override)
+ . = ..()
+ locate_machinery()
+
+/obj/machinery/power/shuttle/engine/turbine/ui_interact(mob/user, datum/tgui/ui)
+ ui = SStgui.try_update_ui(user, src, ui)
+ if(!ui)
+ ui = new(user, src, "TurbineComputer", name)
+ ui.open()
+
+/obj/machinery/power/shuttle/engine/turbine/ui_data(mob/user)
+ var/list/data = list()
+ data["compressor"] = compressor ? TRUE : FALSE
+ data["compressor_broke"] = (!compressor || (compressor.machine_stat & (BROKEN|MAINT))) ? TRUE : FALSE
+ data["turbine"] = compressor?.turbine ? TRUE : FALSE
+ data["turbine_broke"] = (!compressor || !compressor.turbine || (compressor.turbine.machine_stat & (BROKEN|MAINT))) ? TRUE : FALSE
+ data["online"] = compressor?.starter
+ data["power"] = DisplayPower(compressor?.turbine?.lastgen)
+ data["rpm"] = compressor?.rpm
+ data["temp"] = compressor?.gas_contained.return_temperature()
+ data["pressure"] = compressor?.gas_contained.return_pressure()
+ return data
+
+/obj/machinery/power/shuttle/engine/turbine/ui_act(action, params)
+ . = ..()
+ if(.)
+ return
+
+ switch(action)
+ if("toggle_power")
+ if(compressor && compressor.turbine)
+ compressor.starter = !compressor.starter
+ . = TRUE
+ if("reconnect")
+ locate_machinery()
+ . = TRUE
+
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+// COMPUTER NEEDS A SERIOUS REWRITE.
+
+/obj/machinery/computer/turbine_computer
+ name = "gas turbine control computer"
+ desc = "A computer to remotely control a gas turbine."
+ icon_screen = "turbinecomp"
+ icon_keyboard = "tech_key"
+ circuit = /obj/item/circuitboard/computer/turbine_computer
+ var/obj/machinery/power/compressor/compressor
+ var/id = 0
+
+/obj/machinery/computer/turbine_computer/Initialize()
+ . = ..()
+ return INITIALIZE_HINT_LATELOAD
+
+/obj/machinery/computer/turbine_computer/LateInitialize()
+ locate_machinery()
+
+/obj/machinery/computer/turbine_computer/locate_machinery()
+ if(id)
+ for(var/obj/machinery/power/compressor/C in SSair.atmos_air_machinery)
+ if(C.comp_id == id)
+ compressor = C
+ return
+ else
+ compressor = locate(/obj/machinery/power/compressor) in range(7, src)
+
+/obj/machinery/computer/turbine_computer/ui_interact(mob/user, datum/tgui/ui)
+ ui = SStgui.try_update_ui(user, src, ui)
+ if(!ui)
+ ui = new(user, src, "TurbineComputer", name)
+ ui.open()
+
+/obj/machinery/computer/turbine_computer/ui_data(mob/user)
+ var/list/data = list()
+ data["compressor"] = compressor ? TRUE : FALSE
+ data["compressor_broke"] = (!compressor || (compressor.machine_stat & (BROKEN|MAINT))) ? TRUE : FALSE
+ data["turbine"] = compressor?.turbine ? TRUE : FALSE
+ data["turbine_broke"] = (!compressor || !compressor.turbine || (compressor.turbine.machine_stat & (BROKEN|MAINT))) ? TRUE : FALSE
+ data["online"] = compressor?.starter
+ data["power"] = DisplayPower(compressor?.turbine?.lastgen)
+ data["rpm"] = compressor?.rpm
+ data["temp"] = compressor?.gas_contained.return_temperature()
+ data["pressure"] = compressor?.gas_contained.return_pressure()
+ return data
+
+/obj/machinery/computer/turbine_computer/ui_act(action, params)
+ . = ..()
+ if(.)
+ return
+
+ switch(action)
+ if("toggle_power")
+ if(compressor && compressor.turbine)
+ compressor.starter = !compressor.starter
+ . = TRUE
+ if("reconnect")
+ locate_machinery()
+ . = TRUE
+
+#undef POWER_TO_THRUST
+#undef COMPFRICTION
+#undef TURBGENQ
+#undef TURBGENG
diff --git a/code/game/objects/items/devices/mines.dm b/code/game/objects/items/devices/mines.dm
new file mode 100644
index 000000000000..112e26e1303b
--- /dev/null
+++ b/code/game/objects/items/devices/mines.dm
@@ -0,0 +1,708 @@
+
+/obj/item/mine
+ name = "mine"
+ desc = "An anti-personnel mine. This one explodes into nothing and does nothing. Why can you see this? You should't be able to see this. Stop looking at this."
+ icon = 'icons/obj/landmine.dmi'
+ w_class = WEIGHT_CLASS_SMALL
+ throw_speed = 3
+ throw_range = 5
+ lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
+ icon_state = "mine"
+ item_state = "assembly"//when we get custom sprites replace this. please
+ base_icon_state = "mine"
+
+ /// Is our mine live?
+ var/armed = FALSE
+ /// Is our mine currently exploding?
+ var/triggered = FALSE
+
+ /// Sets a delay for mines going live after being planted
+ var/arm_delay = 5 SECONDS
+ /// Use to set a delay after activation to trigger the explosion.
+ var/blast_delay = 1 DECISECONDS
+
+ var/manufacturer = MANUFACTURER_NONE
+
+
+/obj/item/mine/Initialize(mapload)
+ . = ..()
+ if(armed)
+ now_armed()
+
+
+/obj/item/mine/examine(mob/user)
+ . = ..()
+ if(!armed)
+ . += span_info("It appears to be inactive...")
+ else
+ . += span_info("It looks ready to explode.")
+
+ if(manufacturer)
+ . += span_notice("It has [manufacturer] engraved on it.")
+
+/obj/item/mine/update_icon_state()
+ . = ..()
+ icon_state = "[base_icon_state][triggered ? "_exploding" : null][!armed && anchored ? "_arming" : null][armed && anchored && !triggered ? "_armed" : null]"
+
+//mines have a small chance to be triggered by damage, but they take longer to explode
+/obj/item/mine/take_damage(damage_amount, damage_type, damage_flag, sound_effect, attack_dir)
+ . = ..()
+ if(prob(35) & obj_integrity > 0)
+ blast_delay = blast_delay * 2
+ trigger_mine()
+
+//insert your horrible fate here
+/obj/item/mine/proc/mine_effect(mob/victim)
+ return
+
+//handles controlled deactivation
+/obj/item/mine/proc/disarm()
+ if(triggered) //no turning back now
+ return
+ anchored = FALSE
+ armed = FALSE
+ update_appearance(UPDATE_ICON_STATE)
+ return
+
+//using an unarmed mine inhand deploys it.
+/obj/item/mine/attack_self(mob/user)
+ if(!armed)
+ user.visible_message(span_danger("[user] deploys the [src]."), span_notice("You deploy the [src]."))
+
+ user.dropItemToGround(src)
+ anchored = TRUE
+ playsound(src, 'sound/machines/click.ogg', 60, TRUE)
+
+ if(arm_delay)
+ armed = FALSE
+ update_appearance(UPDATE_ICON_STATE)
+ addtimer(CALLBACK(src, PROC_REF(now_armed)), arm_delay)
+ else
+ armed = TRUE
+ message_admins("[key_name(user)] has placed \a [src] at ([x],[y],[z]).")
+
+//let them know the mine's done cooking
+/obj/item/mine/proc/now_armed()
+ armed = TRUE
+ update_appearance(UPDATE_ICON_STATE)
+ playsound(src, 'sound/machines/nuke/angry_beep.ogg', 55, FALSE, 1)
+ visible_message("\The [src] beeps softly, indicating it is now active.", vision_distance = COMBAT_MESSAGE_RANGE)
+
+/// Can this mine trigger on the passed movable?
+/obj/item/mine/proc/can_trigger(atom/movable/on_who)
+ //var/badtype = typecacheof(list(/obj/effect, /obj/item/mine))
+ if(triggered || !isturf(loc) || !armed || iseffect(on_who) || istype(on_who, /obj/item/mine))
+ return FALSE
+ //if(on_who == badtype)//no recursive self triggering. Bad landmine
+ // return FALSE
+ return TRUE
+
+/// When something sets off a mine
+/obj/item/mine/proc/trigger_mine(atom/movable/triggerer)
+ if(obj_integrity <= 0)
+ return
+ if(triggered) //too busy detonating to detonate again
+ return
+ if(triggerer)
+ triggerer.visible_message(span_danger("[icon2html(src, viewers(src))] [triggerer] sets off \the [src]. It's gonna blow!"), span_danger("[icon2html(src, viewers(src))] \The [src] activates."))
+ else
+ visible_message(span_danger("[icon2html(src, viewers(src))] \the [src] begins to flash bright red!"))
+ triggered = TRUE
+ update_appearance(UPDATE_ICON_STATE)
+ if(blast_delay >= 5 DECISECONDS)
+ playsound(src, 'sound/items/mine_activate.ogg', 70, FALSE)
+ else
+ playsound(src, 'sound/items/mine_activate_short.ogg', 80, FALSE)
+ light_color = "#FF0000"
+ light_power = 5
+ light_range = 3
+ if(!blast_delay)//addtimer gets mad if the delay is 0
+ blast_now(triggerer)
+ else
+ addtimer(CALLBACK(src, PROC_REF(blast_now), triggerer), blast_delay)
+
+//NOW we actually blow up
+/obj/item/mine/proc/blast_now(atom/movable/triggerer)
+ var/datum/effect_system/spark_spread/sporks = new /datum/effect_system/spark_spread
+ sporks.set_up(3, 1, src)
+ sporks.start()
+ if(ismob(triggerer))
+ mine_effect(triggerer)
+ else
+ mine_effect()
+ visible_message(span_danger("[icon2html(src, viewers(src))] \the [src] detonates!"))
+ SEND_SIGNAL(src, COMSIG_MINE_TRIGGERED, triggerer)
+ if(triggered)//setting triggered to false in mine_effect() creates a reusable mine
+ qdel(src)
+
+//trying to pick up a live mine is probably up there when it comes to terrible ideas
+/obj/item/mine/attack_hand(mob/user)
+ if(armed)
+ user.visible_message(span_warning("[user] extends their hand towards \the [src]!"), span_userdanger("You extend your arms to pick up \the [src], knowing that it will likely blow up when you touch it!"))
+ if(do_after(user, 5 SECONDS, target = src))//SO SO generous. You can still step back from the edge.
+ if(prob(10))
+ user.visible_message(span_notice("[user] picks up \the [src], which miraculously doesn't explode!"), span_notice("You pick up \the [src], which miraculously doesn't explode!"))
+ disarm()
+ else
+ user.visible_message(span_danger("[user] attempts to pick up \the [src] only to hear a beep as it activates in their hand!"), span_danger("You attempt to pick up \the [src] only to hear a beep as it activates in your hands!"))
+ anchored = FALSE
+ trigger_mine(user)
+ return . =..()
+ else
+ user.visible_message(span_notice("[user] withdraws their hand from \the [src]."), span_notice("You decide against picking up \the [src]."))
+ . =..()
+
+//just don't.
+/obj/item/mine/attackby(obj/item/I, mob/user)
+ if(!armed)
+ to_chat(user, span_notice("You smack \the [src] with [I]. Thankfully, nothing happens."))
+ return
+ else//please stop hitting the live mine with a rock
+ if(user.a_intent != INTENT_HARM)//are you SURE you want to hit the live mine with a rock
+ user.visible_message(user, span_notice("[user] gently pokes \the [src] with [I]. Nothing seems to happen."), span_notice("You gently prod \the [src] with [I]. Thankfully, nothing happens."))
+ else//at this point it's just natural selection
+ user.visible_message(span_danger("[user] hits \the [src] with [I], activating it!"), span_userdanger("[icon2html(src, viewers(src))]You hit \the [src] with [I]. The light goes red."))
+ trigger_mine(user)
+
+//
+//PRESSURE BASED MINE:
+//Mine that explodes when stepped on.
+/obj/item/mine/pressure
+ name = "dummy landmine"
+ /// When true, mines trigger instantly on being stepped upon
+ var/hair_trigger = FALSE
+ /// Has the mine loc been entered?
+ var/clicked = FALSE
+ /// Prevents a mine from being screwdrivable (e.g. cannot be disarmed)
+ var/sealed = FALSE
+ /// Disables the mine without disarming it. perfect for practical jokes
+ var/dud = FALSE
+
+ /// Are the wires exposed?
+ var/open_panel = FALSE
+
+ /// Who's got their foot on the mine's pressure plate
+ /// Stepping on the mine will set this to the first mob who stepped over it
+ /// The mine will not detonate via movement unless the first mob steps off of it
+ var/datum/weakref/foot_on_mine
+
+/obj/item/mine/pressure/Initialize()
+ . = ..()
+ var/static/list/loc_connections = list(
+ COMSIG_ATOM_ENTERED = PROC_REF(on_entered),
+ COMSIG_ATOM_EXITED = PROC_REF(on_exited),
+ )
+ AddElement(/datum/element/connect_loc, loc_connections)
+ wires = new /datum/wires/mine(src)
+
+/obj/item/mine/pressure/examine(mob/user)
+ . = ..()
+ if(hair_trigger)
+ . += span_danger("It's been rigged to detonate as soon as someone steps on it.")
+ else
+ var/atom/movable/unlucky_sod = foot_on_mine?.resolve()
+ if(user == unlucky_sod)
+ . += span_bolddanger("The pressure plate is depressed. Any movement you make will set it off now.")
+ else if(!isnull(unlucky_sod))
+ . += span_danger("The pressure plate is depressed by [unlucky_sod]. Any move they make'll set it off now.")
+
+//step 1: the mistake
+/obj/item/mine/pressure/proc/on_entered(datum/source, atom/movable/arrived)
+ SIGNAL_HANDLER
+ if(!can_trigger(arrived))
+ return
+ // Flying = can't step on a mine
+ if(arrived.movement_type & FLYING)
+ return
+ //no cheap disarming
+ if(arrived.throwing && isitem(arrived))
+ return
+ // Someone already on it
+ if(foot_on_mine?.resolve())
+ return
+
+ if(dud == FALSE)//we don't actually need this if the mine's been disabled
+ foot_on_mine = WEAKREF(arrived)
+
+ if(ismob(arrived))
+ var/mob/living/fool = arrived
+ fool.do_alert_animation(fool)
+ if(!hair_trigger)
+ fool.Immobilize(25 DECISECONDS, TRUE)
+ to_chat(fool, span_userdanger("You step on \the [src] and freeze."))
+ visible_message(span_danger("[icon2html(src, viewers(src))] *click*"))
+ if(dud == FALSE)//see wirecutting
+ clicked = TRUE
+ if(hair_trigger)
+ trigger_mine(arrived)
+ playsound(src, 'sound/machines/click.ogg', 100, TRUE)
+
+//step 2: the consequences
+/obj/item/mine/pressure/proc/on_exited(datum/source, atom/movable/gone)
+ SIGNAL_HANDLER
+ if(hair_trigger)
+ return
+ if(!clicked)
+ return
+ if(!can_trigger(gone))
+ return
+ // Check that the guy who's on it is stepping off
+ if(foot_on_mine && !IS_WEAKREF_OF(gone, foot_on_mine))
+ return
+ INVOKE_ASYNC(src, PROC_REF(trigger_mine), gone)
+ foot_on_mine = null
+
+/obj/item/mine/pressure/disarm()
+ clicked = FALSE
+ . = ..()
+
+//handles disarming(and failing to disarm)
+/obj/item/mine/pressure/attackby(obj/item/I, mob/user)
+ if(I.tool_behaviour == TOOL_SCREWDRIVER)
+ if(sealed)
+ to_chat(user, "You can't see any way to access \the [src]'s wiring.")
+ return
+ open_panel = !open_panel
+ update_appearance(UPDATE_ICON_STATE)
+ to_chat(user, "You [open_panel ? "reveal" : "hide"] \the [src]'s wiring.")
+ I.play_tool_sound(src, 50)
+ return
+ else if(is_wire_tool(I) && open_panel)
+ wires.interact(user)
+ return
+ else
+ . = ..()
+
+//
+//PROXIMITY MINES
+//Mines that explode when someone moves nearby. Simpler, because I don't have to worry about saving step info or disarming logic
+//
+
+/obj/item/mine/proximity
+ name = "dummy proximity mine"
+ blast_delay = 15 DECISECONDS
+ arm_delay = 10 SECONDS//clear the area
+ ///needed for the proximity checks.
+ var/datum/proximity_monitor/proximity_monitor
+ var/proximity_range = 2
+
+/obj/item/mine/proximity/Initialize(mapload)
+ . = ..()
+ START_PROCESSING(SSfastprocess, src)
+
+/obj/item/mine/proximity/examine(mob/user)
+ . = ..()
+ if(armed)
+ . += span_danger("It's been rigged to detonate as soon as someone moves nearby...")
+ else
+ . += span_notice("When armed, it activates based on the proximity of living targets.")
+
+/obj/item/mine/proximity/now_armed()
+ . = ..()
+ proximity_monitor = new(src, proximity_range)
+ light_color = "#FF0000"
+ light_power = 1
+ light_range = 1
+
+/obj/item/mine/proximity/disarm()
+ . = ..()
+ QDEL_NULL(proximity_monitor)
+
+/obj/item/mine/proximity/Destroy()
+ STOP_PROCESSING(SSfastprocess, src)
+ QDEL_NULL(proximity_monitor)
+ . = ..()
+
+/obj/item/mine/proximity/HasProximity(atom/movable/triggerer)
+ if(!iscarbon(triggerer))//let's keep these on player movements for now.
+ return
+ if(!can_trigger(triggerer))
+ return
+ var/mob/living/clueless = triggerer
+ clueless.do_alert_animation(clueless)
+ trigger_mine(triggerer)
+ QDEL_NULL(proximity_monitor)
+ return
+
+//
+//LANDMINE TYPES
+//Rylie please help me make these more immersive
+//
+
+/obj/item/mine/pressure/explosive
+ name = "\improper G-80 Landmine"
+ desc = "An anti-infantry explosive produced during the corporate wars. Watch your step."
+
+ //customize explosive power
+ var/range_devastation = 0
+ var/range_heavy = 1
+ var/range_light = 5
+ var/range_flame = 1
+
+ //using this to indicate pb
+ var/range_flash = 1
+
+ //customize shrapnel. Magnitude zero prevents them from spawning
+ var/shrapnel_type = /obj/projectile/bullet/shrapnel
+ var/shrapnel_magnitude = 3
+
+ /// If TRUE, we spawn extra pellets to eviscerate a person still sitting on it, otherwise it just spawns a ring of pellets around the tile we're on (making setting it off an offensive move)
+ var/shred_triggerer = TRUE
+
+ manufacturer = MANUFACTURER_SCARBOROUGH
+
+/obj/item/mine/pressure/explosive/mine_effect(mob/victim)
+ explosion(loc, range_devastation, range_heavy, range_light, range_flash, 1, 0, range_flame, 0, 1)
+ if(shrapnel_magnitude > 0)
+ AddComponent(/datum/component/pellet_cloud, projectile_type=shrapnel_type, magnitude=shrapnel_magnitude)
+
+
+/obj/item/mine/pressure/explosive/rusty
+ name = "\improper Rusted Landmine"
+ desc = "An anti-infantry explosive, designed to go off underfoot. This one has seen better days."
+ manufacturer = MANUFACTURER_NONE
+ range_heavy = 0
+ range_light = 3
+ shrapnel_type = /obj/projectile/bullet/shrapnel/rusty
+
+
+/obj/item/mine/pressure/explosive/fire
+ name = "\improper G-82 Incindeary"
+ desc = "An anti-infantry explosive produced during the corporate wars. Transforms into superheated slag and a ball of fire on detonation. "
+
+ range_flame = 6
+ range_light = 3
+ range_flash = 3
+
+ shrapnel_type = /obj/projectile/bullet/shrapnel/hot
+ shrapnel_magnitude = 4
+
+/obj/item/mine/pressure/explosive/fire/mine_effect(mob/victim)
+ if(victim.is_holding(src))//in case it's been picked up
+ for(var/turf/T in view(4,victim))
+ T.IgniteTurf(15)
+ new /obj/effect/hotspot(T)
+ else
+ for(var/turf/T in view(4,src))
+ T.IgniteTurf(15)
+ new /obj/effect/hotspot(T)
+ . = ..()
+
+
+/obj/item/mine/pressure/explosive/heavy
+ name = "\improper G-81 Anti-Tank Mine"
+ desc = "An immense anti-vehicle explosive built during the corporate wars. Someone has recklessly switched out the detonator for one that activates for lighter targets."
+ w_class = WEIGHT_CLASS_BULKY
+ range_heavy = 6
+ range_light = 9
+ shrapnel_magnitude = 7
+ shrapnel_type = /obj/projectile/bullet/shrapnel/mega
+ blast_delay = 50//run.
+ sealed = TRUE//unless we specifically give it to people disarmed, we probably don't want them stealing this
+
+
+/obj/item/mine/pressure/explosive/shrapnel
+ name = "\improper G-84 Fragmentation"
+ desc = "An anti-infantry explosive built during the corporate wars. Metal banding inside creates additional deadly shrapnel on detonation. "
+
+ range_heavy = 1
+ range_light = 4
+
+ shrapnel_magnitude = 6
+ shred_triggerer = TRUE
+
+/obj/item/mine/pressure/explosive/rad
+ name = "\improper G-85 Fission"
+ desc = "An anti-infantry explosive produced during the corporate wars. This one detonates a small microfission core, creating a bloom of deadly radiation. "
+ range_light = 4
+ range_flame = 2
+ shrapnel_magnitude = 7
+ shrapnel_type = /obj/projectile/bullet/shrapnel/spicy
+ var/radpower = 750
+
+/obj/item/mine/pressure/explosive/rad/mine_effect(mob/victim)
+ radiation_pulse(src, radpower, 1)
+ . = ..()
+
+//put this on military ships for disarming practice
+/obj/item/mine/pressure/training
+ name = "\improper G-MTH Defusal Trainer"
+ desc = "A mothballed anti-personnel explosive, equipped with VISCERAL DEFUSAL ACTION for training purposes. Though Scarborough was forced to decomission their stockpiles of mines as part of the ceasefire, the deployed minefields remain."
+ arm_delay = 2 SECONDS
+ manufacturer = MANUFACTURER_SCARBOROUGH
+
+/obj/item/mine/pressure/training/mine_effect(mob/living/victim)
+ src.say("BOOM! Better luck next time!")
+ src.visible_message(span_notice("The mine resets itself for another disarming attempt."))
+ triggered = FALSE
+ disarm()
+ . = ..()
+
+/obj/item/mine/pressure/gas
+ name = "chilled vapor mine"
+ desc = "A non-lethal security deterrent."
+ var/gas_amount = 500
+ var/gas_type = "water_vapor"
+ hair_trigger = TRUE
+
+/obj/item/mine/pressure/gas/mine_effect(mob/victim)
+ atmos_spawn_air("[gas_type]=[gas_amount]")
+
+
+/obj/item/mine/proximity/explosive
+ name = "\improper G-80P Bouncer"
+ desc = "An anti-infantry explosive produced during the corporate wars. This one has been rearmed with a proximity movement detector."
+
+ var/range_devastation = 0
+ var/range_heavy = 2
+ var/range_light = 4
+ var/range_flame = 1
+
+ var/range_flash = 1
+
+ var/shrapnel_type = /obj/projectile/bullet/shrapnel
+ var/shrapnel_magnitude = 5
+
+ manufacturer = MANUFACTURER_SCARBOROUGH
+
+/obj/item/mine/proximity/explosive/mine_effect(mob/victim)
+ explosion(loc, range_devastation, range_heavy, range_light, range_flash, 1, 0, range_flame, 0, 1)
+ if(shrapnel_magnitude > 0)
+ AddComponent(/datum/component/pellet_cloud, projectile_type=shrapnel_type, magnitude=shrapnel_magnitude)
+
+
+//like all real 'less' than lethal crowd control options this is, in fact, not very good at being nonlethal
+/obj/item/mine/proximity/explosive/sting
+ name = "\improper'Stinger' Crowd Management Device"
+ desc = "A \"less\" than lethal crowd control weapon, designed to demoralise and scatter anti-NT protestors. The bands of ballistic gel inside strike targets and incapacitate without causing serious maiming. In Theory."
+
+ range_heavy = 0
+ range_light = 1
+ range_flash = 3
+ range_flame = 0
+
+ shrapnel_magnitude = 8
+ shrapnel_type = /obj/projectile/bullet/pellet/stingball
+ manufacturer = MANUFACTURER_NANOTRASEN_OLD
+
+
+/obj/item/mine/proximity/explosive/plasma
+ name = "\improper Etherbor EP-3"
+ desc = "An anti-infantry explosive designed by the PGF for denial of territory to enemy forces. Radiates high energy plasma to eradicate nearby targets."
+ range_light = 2
+ range_flame = 3
+ range_heavy = 0
+ shrapnel_magnitude = 8
+ shrapnel_type = /obj/projectile/energy/plasmabolt
+ manufacturer = MANUFACTURER_PGF
+
+/obj/item/mine/proximity/explosive/plasma/mine_effect(mob/victim)
+ if(victim.is_holding(src))//in case it's been picked up
+ for(var/turf/T in view(3,victim))
+ T.IgniteTurf(25, "green")
+ else
+ for(var/turf/T in view(3,src))
+ T.IgniteTurf(25, "green")
+ . = ..()
+
+//Manhacks... so pretty...
+/obj/item/mine/proximity/spawner
+ name = "debug spawner mine"
+ desc = "Real no Virus. 100% free. Coders hate him!"
+ var/spawn_type = null //manhacks go here :)
+ var/spawn_number = 5
+
+/obj/item/mine/proximity/spawner/mine_effect(mob/victim)
+ if(isturf(loc))
+ var/turf/T = get_turf(src)
+ playsound(T, 'sound/effects/phasein.ogg', 100, TRUE)
+ spawn_and_random_walk(spawn_type, T, spawn_number, walk_chance=50, admin_spawn=((flags_1 & ADMIN_SPAWNED_1) ? TRUE : FALSE))
+ . = ..()
+
+/obj/item/mine/proximity/spawner/manhack
+ name = "\improper P-83 Lacerator"
+ desc = "An anti-infantry device produced during the corporate wars. The explosive payload has been swapped out for 'viscerator'-type antipersonnel drones."
+ spawn_type = /mob/living/simple_animal/hostile/viscerator
+
+//
+//GIMMICK MINES//
+//pretty much exclusively for adminbus & code dependencies
+//
+
+/obj/item/mine/pressure/kickmine
+ name = "\improper A-00 'Adminbus'"
+ desc = "An Anti-Griefer proximity expulsive. Delivers Justice."
+ blast_delay = null//funnier this way
+ hair_trigger = TRUE
+
+/obj/item/mine/pressure/kickmine/mine_effect(mob/victim)
+ if(isliving(victim) && victim.client && Adjacent(victim))
+ to_chat(victim, span_userdanger("You have been kicked from the game. Take this time to think about what you've done."))
+ qdel(victim.client)
+
+/obj/item/mine/pressure/sound
+ name = "sonic mine"
+ desc = "A potent tool of psychological warfare."
+ var/sound = 'sound/effects/adminhelp.ogg'
+ blast_delay = null
+ hair_trigger = TRUE
+
+/obj/item/mine/pressure/sound/mine_effect(mob/victim)
+ playsound(loc, sound, 100, TRUE)
+
+/obj/item/mine/pressure/pickup
+ name = "pickup mine"
+ desc = "does nothing"
+ icon = 'icons/obj/marg.dmi'
+ icon_state = "marg"
+ density = FALSE
+ var/duration = 0
+ pixel_x = -8
+ pixel_y = 1
+ anchored = TRUE
+ armed = TRUE
+ blast_delay = null
+ hair_trigger = TRUE
+
+/obj/item/mine/pressure/pickup/Initialize()
+ . = ..()
+ animate(src, time = 20, loop = -1)
+
+/obj/item/mine/pressure/pickup/trigger_mine(mob/victim)
+ if(triggered)
+ return
+ triggered = TRUE
+ invisibility = INVISIBILITY_ABSTRACT
+ mine_effect(victim)
+ qdel(src)
+
+
+/obj/item/mine/pressure/pickup/bloodbath
+ name = "bloody orb"
+ desc = "Embrace righteous fury."
+ duration = 1200 //2min
+ color = "#FF0000"
+ var/mob/living/doomslayer
+ var/obj/item/chainsaw/doomslayer/chainsaw
+
+/obj/item/mine/pressure/pickup/bloodbath/mine_effect(mob/living/carbon/victim)
+ if(!victim.client || !istype(victim))
+ return
+ to_chat(victim, "RIP AND TEAR")
+
+ INVOKE_ASYNC(src, PROC_REF(blood_delusion), victim)
+
+ chainsaw = new(victim.loc)
+ victim.log_message("entered a marg frenzy", LOG_ATTACK)
+
+ ADD_TRAIT(chainsaw, TRAIT_NODROP, CHAINSAW_FRENZY_TRAIT)
+ victim.drop_all_held_items()
+ victim.put_in_hands(chainsaw, forced = TRUE)
+ chainsaw.attack_self(victim)
+ victim.reagents.add_reagent(/datum/reagent/medicine/adminordrazine,25)
+ to_chat(victim, "KILL, KILL, KILL! YOU HAVE NO ALLIES ANYMORE, KILL THEM ALL!")
+
+ var/datum/client_colour/colour = victim.add_client_colour(/datum/client_colour/bloodlust)
+ QDEL_IN(colour, 11)
+ doomslayer = victim
+ RegisterSignal(src, COMSIG_PARENT_QDELETING, PROC_REF(end_blood_frenzy))
+ QDEL_IN(WEAKREF(src), duration)
+
+/obj/item/mine/pressure/pickup/bloodbath/proc/end_blood_frenzy()
+ if(doomslayer)
+ to_chat(doomslayer, "Your bloodlust seeps back into the bog of your subconscious and you regain self control.")
+ doomslayer.log_message("exited a blood frenzy", LOG_ATTACK)
+ if(chainsaw)
+ qdel(chainsaw)
+
+/obj/item/mine/pressure/pickup/bloodbath/proc/blood_delusion(mob/living/carbon/victim)
+ new /datum/hallucination/delusion(victim, TRUE, "demon", duration, 0)
+
+/obj/item/mine/pressure/pickup/healing
+ name = "healing orb"
+ desc = "Your wounds shall be undone."
+
+/obj/item/mine/pressure/pickup/healing/mine_effect(mob/living/carbon/victim)
+ if(!victim.client || !istype(victim))
+ return
+ to_chat(victim, "You feel great!")
+ victim.revive(full_heal = TRUE, admin_revive = TRUE)
+
+/obj/item/mine/pressure/pickup/speed
+ name = "quick orb"
+ desc = "Quickens you."
+ duration = 300
+
+/obj/item/mine/pressure/pickup/speed/mine_effect(mob/living/carbon/victim)
+ if(!victim.client || !istype(victim))
+ return
+ to_chat(victim, "You feel fast!")
+ victim.add_movespeed_modifier(/datum/movespeed_modifier/yellow_orb)
+ addtimer(CALLBACK(src, PROC_REF(finish_effect), victim), duration)
+
+/obj/item/mine/pressure/pickup/speed/proc/finish_effect(mob/living/carbon/victim)
+ victim.remove_movespeed_modifier(/datum/movespeed_modifier/yellow_orb)
+ to_chat(victim, "You slow down.")
+
+
+
+//
+//mapping tool that generates "live" variants of all mine subtypes, which are anchored and ready to blow.
+//Add new mine variants you make below as a LIVE_MINE_HELPER define containing their subtyping.
+//
+
+#define LIVE_MINE_HELPER(mine_type) \
+ /obj/item/mine/##mine_type/live { \
+ anchored = TRUE; \
+ armed = TRUE; \
+ }
+
+LIVE_MINE_HELPER(pressure/explosive)
+LIVE_MINE_HELPER(pressure/explosive/fire)
+LIVE_MINE_HELPER(pressure/explosive/rusty)
+LIVE_MINE_HELPER(pressure/explosive/rad)
+LIVE_MINE_HELPER(pressure/explosive/heavy)
+LIVE_MINE_HELPER(pressure/explosive/shrapnel)
+
+LIVE_MINE_HELPER(proximity/explosive)
+LIVE_MINE_HELPER(proximity/explosive/sting)
+LIVE_MINE_HELPER(proximity/spawner/manhack)
+LIVE_MINE_HELPER(proximity/explosive/plasma)
+
+LIVE_MINE_HELPER(pressure/gas)
+LIVE_MINE_HELPER(pressure/kickmine)
+LIVE_MINE_HELPER(pressure/sound)
+
+//
+// spawners (random mines, minefields, non-guaranteed mine)
+//
+
+/obj/effect/spawner/lootdrop/mine
+ name = "live mine spawner (random)"
+ lootcount = 1
+ fan_out_items = TRUE
+ loot = list(
+ /obj/item/mine/pressure/explosive/live = 10,
+ /obj/item/mine/pressure/explosive/shrapnel/live = 3,
+ /obj/item/mine/pressure/explosive/rad/live = 3,
+ /obj/item/mine/pressure/explosive/fire/live = 3)
+
+/obj/effect/spawner/minefield
+ name = "minefield spawner"
+ var/minerange = 9
+ var/minetype = /obj/item/mine/pressure/explosive/rusty/live
+
+/obj/effect/spawner/minefield/Initialize(mapload)
+ . = ..()
+ for(var/turf/open/T in view(minerange,loc))
+ if(prob(5))
+ new minetype(T)
+
+/obj/effect/spawner/minefield/random
+ name = "random minefield spawner"
+ minetype = /obj/effect/spawner/lootdrop/mine
+
+/obj/effect/spawner/minefield/manhack
+ name = "manhack field spawner"
+ minetype = /obj/item/mine/proximity/spawner/manhack/live
diff --git a/code/modules/clothing/factions/clip.dm b/code/modules/clothing/factions/clip.dm
new file mode 100644
index 000000000000..82e1fdee68b0
--- /dev/null
+++ b/code/modules/clothing/factions/clip.dm
@@ -0,0 +1,427 @@
+//under
+
+/obj/item/clothing/under/clip
+ name = "clip deck worker jumpsuit"
+ desc = "A jumpsuit worn by deck workers in the CLIP Minutemen Navy vessels."
+
+ icon = 'icons/obj/clothing/faction/clip/uniforms.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/clip/uniforms.dmi'
+
+ icon_state = "clip_deck"
+ item_state = "b_suit"
+
+ alt_covers_chest = TRUE
+ sensor_mode = SENSOR_COORDS
+ random_sensor = FALSE
+ dying_key = DYE_REGISTRY_UNDER //??? // it's for washing machines don't worry about it
+
+ can_adjust = FALSE
+ supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION | KEPORI_VARIATION // a new record!
+
+/obj/item/clothing/under/clip/minutemen
+ name = "clip minutemen fatigues"
+ desc = "Fatigues worn by the CLIP Minutemen's enlisted."
+
+ icon_state = "clip_minuteman"
+
+ armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 30, "acid" = 30)
+ strip_delay = 50
+
+ can_adjust = FALSE
+ supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION | KEPORI_VARIATION
+
+/obj/item/clothing/under/clip/formal
+ name = "formal clip outfit"
+ desc = "A formal outfit containing a white shirt and navy slacks issued to CLIP government workers. Commonly seen on more white collar CLIP bureaucrats than low ranking CLIP Minutemen officers."
+
+ icon_state = "clip_formal"
+
+ armor = null
+ supports_variations = null
+
+/obj/item/clothing/under/clip/formal/alt
+ name = "formal clip outfit"
+ desc = "A formal outfit containing a white shirt and a navy skirt issued to CLIP government workers. Commonly seen on more white collar CLIP bureaucrats than low ranking CLIP Minutemen officers."
+
+ icon_state = "clip_formal_skirt"
+
+/obj/item/clothing/under/clip/formal/with_shirt/Initialize()
+ . = ..()
+ var/obj/item/clothing/accessory/clip_formal_overshirt/accessory = new (src)
+ attach_accessory(accessory)
+
+/obj/item/clothing/under/clip/formal/with_shirt/alt //because of how fucking skirt code works...
+ name = "formal clip outfit"
+ desc = "A formal outfit containing a white shirt and a navy skirt issued to CLIP government workers. Commonly seen on more white collar CLIP bureaucrats than low ranking CLIP Minutemen officers."
+
+ icon_state = "clip_formal_skirt"
+
+/obj/item/clothing/under/clip/medic
+ name = "medical clip uniform"
+ desc = "A uniform with navy slacks and a CLIP blue buttondown shirt. The shoulder markings have a medical symbol. "
+
+ icon_state = "clip_medic"
+
+/obj/item/clothing/under/clip/officer
+ name = "clip minutemen officer uniform"
+ desc = "A uniform used by higher ranking officers of the CLIP Minutemen."
+ icon_state = "clip_officer"
+ item_state = "g_suit"
+ can_adjust = FALSE
+
+/obj/item/clothing/under/clip/officer/alt
+ name = "clip minutemen officer uniform"
+ desc = "A uniform with a pencil skirt used by higher ranking officers of the CLIP Minutemen."
+ icon_state = "clip_officer_skirt"
+
+//suit
+/obj/item/clothing/suit/toggle/lawyer/clip
+ name = "CLIP Minutemen suit jacket"
+ desc = "An enterprising dress jacket used by officers of the CLIP Minutemen."
+
+ icon = 'icons/obj/clothing/faction/clip/suits.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/clip/suits.dmi'
+
+ icon_state = "suitjacket_clip"
+ item_state = "suitjacket_navy"
+
+/obj/item/clothing/suit/toggle/lawyer/clip/Initialize()
+ . = ..()
+ if(!allowed)
+ allowed = GLOB.security_vest_allowed //it's hop-equivalent gear after all
+
+/obj/item/clothing/suit/toggle/lawyer/clip/fo
+ name = "CLIP Minutemen First Officer suit jacket"
+ desc = "An enterprising dress jacket used by First Officer of CLIP Minutemen vessels."
+
+ icon_state = "suitjacket_clip_command"
+ item_state = "suitjacket_clip_command"
+
+//armor
+
+/obj/item/clothing/suit/armor/vest/capcarapace/clip
+ name = "CLIP Minutemen general coat"
+ desc = "A very fancy coat used by generals of the CLIP Minutemen."
+
+ icon = 'icons/obj/clothing/faction/clip/suits.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/clip/suits.dmi'
+
+ icon_state = "clip_general"
+ item_state = "clip_general"
+
+/obj/item/clothing/suit/armor/vest/capcarapace/clip/admiral
+ name = "CLIP Minutemen admiral trenchcoat"
+ desc = "A very fancy trenchcoat used by admirals of the CLIP Minutemen."
+
+ icon_state = "clip_admiral"
+ item_state = "clip_admiral"
+
+/obj/item/clothing/suit/armor/riot/clip
+ name = "black riot suit"
+ desc = "Designed to protect against close range attacks. This one is painted black. Mainly used by the CM-BARD against hostile xenofauna, it also sees prolific by some CLIP members."
+
+ icon = 'icons/obj/clothing/faction/clip/suits.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/clip/suits.dmi'
+ icon_state = "riot_clip"
+
+/obj/item/clothing/suit/armor/clip_trenchcoat
+ name = "\improper CLIP trenchcoat"
+ desc = "A CLIP trenchcoat. Despite it's reputation as a officer coat, it's actually issued to the entire CLIP government and it's branches. Has a lot of pockets."
+
+ icon = 'icons/obj/clothing/faction/clip/suits.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/clip/suits.dmi'
+
+ icon_state = "clip_trenchcoat"
+ item_state = "trenchcoat_solgov"
+ body_parts_covered = CHEST|LEGS|ARMS
+ armor = list("melee" = 25, "bullet" = 10, "laser" = 25, "energy" = 10, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 0)
+ cold_protection = CHEST|LEGS|ARMS
+ heat_protection = CHEST|LEGS|ARMS
+ supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON
+
+/obj/item/clothing/suit/armor/clip_capcoat
+ name = "\improper CLIP Minutemen captain's coat"
+ desc = "A well-made coat used by CLIP Minutemen captains. It's thick padding stops some hazards for its user."
+
+ icon = 'icons/obj/clothing/faction/clip/suits.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/clip/suits.dmi'
+
+ icon_state = "clip_captaincoat"
+ item_state = "clip_captaincoat"
+ body_parts_covered = CHEST|LEGS|ARMS
+ armor = list("melee" = 25, "bullet" = 10, "laser" = 25, "energy" = 10, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 0)
+ cold_protection = CHEST|LEGS|ARMS
+ heat_protection = CHEST|LEGS|ARMS
+ supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON
+
+//spacesuits
+/obj/item/clothing/suit/space/hardsuit/security/independent/clip //TODO: replace
+ name = "\improper CMM Patroller hardsuit"
+ desc = "A hardsuit used by the CLIP Minutemen. To reduce costs, its a modified version of a more popular model from a independent manufacturer, and given to patrol vessels. As should be obvious, it's not extremely armored, as it's made for reconnaissance and speed."
+
+ icon = 'icons/obj/clothing/faction/clip/suits.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/clip/suits.dmi'
+
+ icon_state = "hardsuit-clip-patrol"
+ hardsuit_type = "hardsuit-clip-patrol"
+ helmettype = /obj/item/clothing/head/helmet/space/hardsuit/security/independent/clip
+
+/obj/item/clothing/head/helmet/space/hardsuit/security/independent/clip //TODO: replace
+ name = "\improper CMM Patroller hardsuit helmet"
+ desc = "A hardsuit used by the CLIP Minutemen. To reduce costs, its a modified version of a more popular model from a independent manufacturer, and given to patrol vessels. As should be obvious, it's not extremely armored, as it's made for reconnaissance and speed."
+
+ icon = 'icons/obj/clothing/faction/clip/head.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/clip/head.dmi'
+
+ icon_state = "hardsuit0-clip-patrol"
+ hardsuit_type = "clip-patrol"
+
+/obj/item/clothing/suit/space/hardsuit/clip_spotter
+ name = "CM-490 'Spotter' Combat Hardsuit"
+ desc = "CLIP's standard EVA combat hardsuit. Due to CLIP's doctrine on range, it doesn't have advanced components that allow swift movement, and thus slows down the user despite the heavy armor."
+
+ icon = 'icons/obj/clothing/faction/clip/suits.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/clip/suits.dmi'
+
+ icon_state = "clip_spotter"
+ hardsuit_type = "clip_spotter"
+
+ armor = list("melee" = 50, "bullet" = 50, "laser" = 30, "energy" = 40, "bomb" = 35, "bio" = 100, "rad" = 60, "fire" = 50, "acid" = 80)
+ helmettype = /obj/item/clothing/head/helmet/space/hardsuit/clip_spotter
+ allowed = list(/obj/item/gun, /obj/item/ammo_box,/obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/melee/transforming/energy/sword/saber, /obj/item/restraints/handcuffs, /obj/item/tank/internals)
+
+ resistance_flags = null
+ slowdown = 1
+
+/obj/item/clothing/head/helmet/space/hardsuit/clip_spotter
+ name = "CM-490 'Spotter' Combat Hardsuit Helmet"
+ desc = "CLIP's standard EVA combat hardsuit. Due to CLIP's doctrine on range, it doesn't have advanced components that allow swift movement, and thus slows down the user despite the heavy armor."
+
+ icon = 'icons/obj/clothing/faction/clip/head.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/clip/head.dmi'
+
+ icon_state = "hardsuit0-clip_spotter"
+ hardsuit_type = "clip_spotter"
+
+ armor = list("melee" = 50, "bullet" = 50, "laser" = 30, "energy" = 40, "bomb" = 35, "bio" = 100, "rad" = 60, "fire" = 50, "acid" = 80)
+ resistance_flags = null
+
+
+//hats
+/obj/item/clothing/head/clip
+ name = "\improper CLIP Minutemen service cap"
+ desc = "A standard issue soft cap dating back to the original Zohil colonial peroid. While usually given to recruits and volunteers, it's sometimes used by occasionally by some Minutemen."
+ icon = 'icons/obj/clothing/faction/clip/head.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/clip/head.dmi'
+// lefthand_file = 'icons/mob/inhands/faction/clip/gezena_lefthand.dmi'
+// righthand_file = 'icons/mob/inhands/faction/clip/gezena_righthand.dmi'
+ icon_state = "clip_cap"
+ item_state = "bluecloth"
+ armor = list("melee" = 10, "bullet" = 10, "laser" = 10, "energy" = 10, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
+
+/obj/item/clothing/head/clip/corpsman
+ name = "\improper CLIP Minutemen corpsman cap"
+ desc = "A standard issue soft cap dating back to the original Zohil colonial peroid. This one is in corpsman colors."
+ icon_state = "clip_mediccap"
+ item_state = "whitecloth"
+
+/obj/item/clothing/head/clip/slouch
+ name = "CLIP Minutemen slouch hat"
+ desc = "A commanding slouch hat used by the CLIP Minutemen."
+ icon_state = "clip_slouch_hat"
+
+/obj/item/clothing/head/clip/slouch/officer
+ name = "CLIP Minutemen officer's slouch hat"
+ desc = "A commanding slouch hat adorned with a officer's badge, used by the CLIP Minutemen."
+ icon_state = "clip_officer_hat"
+ armor = list("melee" = 35, "bullet" = 30, "laser" = 30,"energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
+ strip_delay = 60
+
+/obj/item/clothing/head/clip/boonie
+ name = "CLIP Minutemen boonie hat"
+ desc = "A wide brimmed cap to keep yourself cool during blistering hot weather."
+ icon_state = "clip_boonie"
+
+/obj/item/clothing/head/clip/bicorne
+ name = "general's bicorne"
+ desc = "A fancy bicorne used by generals of the CLIP Minutemen."
+ icon_state = "clip_general_hat"
+ armor = list("melee" = 35, "bullet" = 30, "laser" = 30,"energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
+
+/obj/item/clothing/head/helmet/bulletproof/x11/clip
+ name = "\improper Minutemen X11 Helmet"
+ desc = "A bulletproof helmet worn by members of the CLIP Minutemen."
+
+ icon = 'icons/obj/clothing/faction/clip/head.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/clip/head.dmi'
+
+ icon_state = "clip_x11"
+ allow_post_reskins = FALSE
+ unique_reskin = null
+
+/obj/item/clothing/head/helmet/bulletproof/m10/clip_vc
+ name = "\improper Minutemen Vehicle Crewman M10 Helmet"
+ desc = "A light bulletproof helmet worn by Vehicle Crewmen of the CLIP Minutemen. The ear padding protects the ears from loud noises and the microphone automatically connects with a headset."
+
+ icon = 'icons/obj/clothing/faction/clip/head.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/clip/head.dmi'
+
+ icon_state = "clip_m10_vc"
+ allow_post_reskins = FALSE
+ unique_reskin = null
+
+/obj/item/clothing/head/helmet/bulletproof/m10/clip_vc/ComponentInitialize()
+ . = ..()
+ AddComponent(/datum/component/wearertargeting/earprotection, list(ITEM_SLOT_HEAD))
+
+/obj/item/clothing/head/helmet/riot/clip
+ name = "\improper Minutemen riot helmet"
+ desc = "Designed to protect against close range attacks. Mainly used by the CMM-BARD against hostile xenofauna, it also sees prolific use on some Minutemen member worlds."
+
+ icon = 'icons/obj/clothing/faction/clip/head.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/clip/head.dmi'
+ icon_state = "riot_clip"
+
+//GOLD
+/obj/item/clothing/head/fedora/det_hat/clip
+ name = "GOLD fedora"
+ desc = "A hat issued by the GOLD division of the CLIP Minutemen. Designed to look fashionable and more casual than standard CLIP attire."
+
+ icon = 'icons/obj/clothing/faction/clip/head.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/clip/head.dmi'
+
+ icon_state = "clip_fedora"
+ item_state = "detective"
+
+ armor = list("melee" = 10, "bullet" = 10, "laser" = 10, "energy" = 10, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) //dets hat is armored for some reaon
+
+/obj/item/clothing/head/flatcap/clip
+ name = "GOLD flatcap"
+ desc = "A hat issued by the GOLD division of the CLIP Minutemen. An office worker's hat."
+
+ icon = 'icons/obj/clothing/faction/clip/head.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/clip/head.dmi'
+
+ icon_state = "flatcap_clip"
+ item_state = "detective"
+//mask
+
+/obj/item/clothing/mask/gas/clip
+ name = "CM-20 gas mask"
+ desc = "A close-fitting gas mask that can be connected to an air supply. Created in 420 FS during the Xenofauna war after it was discovered that 20 year old gas masks weren't going cut it against Xenofauna. Standard issue for every Minuteman, but rarely used; it's mostly used as a deterrence against chemical attacks."
+
+ icon = 'icons/obj/clothing/faction/clip/mask.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/clip/mask.dmi'
+
+ icon_state = "clip-gasmask"
+ strip_delay = 60
+
+//gloves
+
+/obj/item/clothing/gloves/color/latex/nitrile/clip
+ name = "long white nitrile gloves"
+ desc = "Thick sterile gloves that reach up to the elbows. Transfers combat medic knowledge into the user via nanochips."
+
+ icon = 'icons/obj/clothing/faction/clip/hands.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/clip/hands.dmi'
+
+ icon_state = "nitrile_clip"
+ item_state = "nitrile_clip"
+
+//boots
+
+//belt
+/obj/item/storage/belt/military/clip
+ name = "CLIP Minutemen chest rig"
+ desc = "A chest rig worn by the CLIP Minutemen."
+
+ icon = 'icons/obj/clothing/faction/clip/belt.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/clip/belt.dmi'
+
+ icon_state = "clipwebbing"
+ item_state = "clipwebbing"
+
+ unique_reskin = null
+
+/obj/item/storage/belt/military/clip/p16/PopulateContents()
+ for(var/i in 1 to 4)
+ new /obj/item/ammo_box/magazine/p16(src)
+ new /obj/item/grenade/frag(src)
+
+/obj/item/storage/belt/military/clip/gal/PopulateContents()
+ for(var/i in 1 to 4)
+ new /obj/item/ammo_box/magazine/gal(src)
+ new /obj/item/grenade/frag(src)
+
+/obj/item/storage/belt/military/clip/cm5/PopulateContents()
+ for(var/i in 1 to 4)
+ new /obj/item/ammo_box/magazine/smgm9mm(src)
+ new /obj/item/grenade/frag(src)
+
+/obj/item/storage/belt/military/clip/cm15/PopulateContents()
+ for(var/i in 1 to 5)
+ new /obj/item/ammo_box/magazine/cm15_mag(src)
+ new /obj/item/grenade/frag(src)
+
+/obj/item/storage/belt/military/clip/e50/PopulateContents()
+ for(var/i in 1 to 5)
+ new /obj/item/stock_parts/cell/gun/large(src)
+ new /obj/item/grenade/frag(src)
+ new /obj/item/screwdriver/nuke(src)
+
+/obj/item/storage/belt/military/clip/engi/PopulateContents()
+ new /obj/item/screwdriver/power(src)
+ new /obj/item/crowbar/power(src)
+ new /obj/item/weldingtool/experimental(src)
+ new /obj/item/multitool(src)
+ new /obj/item/construction/rcd/combat(src)
+ new /obj/item/extinguisher/mini(src)
+ new /obj/item/stack/cable_coil(src)
+
+/obj/item/storage/belt/military/clip/flamer/PopulateContents()
+ for(var/i in 1 to 3)
+ new /obj/item/reagent_containers/glass/beaker/large/fuel(src)
+ new /obj/item/ammo_box/magazine/co9mm(src)
+
+/obj/item/storage/belt/medical/webbing/clip
+ name = "medical webbing"
+ desc = "A chest rig worn by corpsmen of the CLIP Minutemen ."
+
+ icon = 'icons/obj/clothing/faction/clip/belt.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/clip/belt.dmi'
+
+ icon_state = "clip-medwebbing"
+
+/obj/item/storage/belt/medical/webbing/clip/prefilled/PopulateContents()
+ new /obj/item/reagent_containers/medigel/styptic(src)
+ new /obj/item/reagent_containers/medigel/styptic(src)
+ new /obj/item/reagent_containers/medigel/silver_sulf(src)
+ new /obj/item/reagent_containers/medigel/silver_sulf(src)
+ new /obj/item/reagent_containers/medigel/synthflesh(src)
+ new /obj/item/reagent_containers/medigel/synthflesh(src)
+ new /obj/item/stack/medical/splint(src)
+
+//back
+/obj/item/storage/backpack/security/clip
+ name = "clip backpack"
+ desc = "It's a very blue backpack."
+
+ icon_state = "clippack"
+
+/obj/item/storage/backpack/satchel/sec/clip
+ name = "clip satchel"
+ desc = "A robust satchel for anti-piracy related needs."
+ icon_state = "satchel-clip"
+
+
+//neck
+
+//accessories
+
+/obj/item/clothing/accessory/clip_formal_overshirt
+ name = "\improper CLIP overshirt"
+ desc = "A standard issue shirt designed to be worn over the formal uniform's undershirt."
+ icon_state = "clip_formal_overshirt"
+ icon = 'icons/obj/clothing/accessories.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/accessories.dmi'
+ minimize_when_attached = FALSE
diff --git a/code/modules/paperwork/biscuit.dm b/code/modules/paperwork/biscuit.dm
new file mode 100644
index 000000000000..38776e5005bf
--- /dev/null
+++ b/code/modules/paperwork/biscuit.dm
@@ -0,0 +1,104 @@
+/obj/item/folder/biscuit
+ name = "\proper biscuit card"
+ desc = "An biscuit card. Has label which says DO NOT DIGEST."
+ icon_state = "paperbiscuit"
+ bg_color = "#ffffff"
+ w_class = WEIGHT_CLASS_TINY
+ max_integrity = 130
+ drop_sound = 'sound/items/handling/disk_drop.ogg'
+ pickup_sound = 'sound/items/handling/disk_pickup.ogg'
+ /// Is biscuit cracked open or not?
+ var/cracked = FALSE
+
+/obj/item/folder/biscuit/update_overlays()
+ . = ..()
+ if(contents.len) //This is to prevent the not-sealed biscuit to have the folder_paper overlay when it gets sealed
+ . -= "folder_paper"
+ if(cracked) //Shows overlay only when it has content and is cracked open
+ . += "paperbiscuit_paper"
+
+///Checks if the biscuit has been already cracked. If its not then it dipsplays "unopened!" ballon alert. If it is cracked then it lets the code continue.
+/obj/item/folder/biscuit/proc/crack_check(mob/user)
+ if (cracked)
+ return TRUE
+ balloon_alert(user, "unopened!")
+ return FALSE
+
+/obj/item/folder/biscuit/examine()
+ . = ..()
+ if(!cracked)
+ . += span_notice("To reach contents you need to crack it open.")
+
+//All next is done so you can't reach contents, or put any new contents when its not cracked open
+/obj/item/folder/biscuit/remove_item(obj/item/item, mob/user)
+ if (!crack_check(user))
+ return
+
+ return ..()
+
+/obj/item/folder/biscuit/attack_hand(mob/user, list/modifiers)
+ if (LAZYACCESS(modifiers, RIGHT_CLICK) && !crack_check(user))
+ return
+
+ return ..()
+
+/obj/item/folder/biscuit/attackby(obj/item/weapon, mob/user, params)
+ if (is_type_in_typecache(weapon, folder_insertables) && !crack_check(user))
+ return
+
+ return ..()
+
+/obj/item/folder/biscuit/attack_self(mob/user)
+ add_fingerprint(user)
+ if (!cracked)
+ if (tgui_alert(user, "Do you want to crack it open?", "Biscuit Cracking", list("Yes", "No")) != "Yes")
+ return
+ cracked = TRUE
+ playsound(get_turf(user), 'sound/effects/snap.ogg', 60)
+ icon_state = "[icon_state]_cracked"
+ update_appearance()
+
+ ui_interact(user)
+//Corporate "confidental" biscuit cards
+/obj/item/folder/biscuit/confidental
+ name = "\proper confidental biscuit card"
+ desc = "An confidental biscuit card. In a tasteful blue color with NT logo, looks like a chocolate bar. Has label which says DO NOT DIGEST."
+ icon_state = "paperbiscuit_secret"
+ bg_color = "#355e9f"
+
+//Biscuits which start not-sealed/cracked initially for the crafting, printing and such
+/obj/item/folder/biscuit/unsealed
+ name = "\proper biscuit card"
+ desc = "An biscuit card. Has a label which says DO NOT DIGEST."
+ icon_state = "paperbiscuit_cracked"
+ cracked = TRUE
+ ///Was the biscuit already sealed by players? To prevent several tgui alerts
+ var/sealed = FALSE
+ ///What is the sprite for when its not cracked? As it starts already cracked, and for re-sealing needs to have a sprite
+ var/not_cracked_icon = "paperbiscuit"
+
+/obj/item/folder/biscuit/unsealed/examine()
+ . = ..()
+ if(!sealed)
+ . += span_notice("This one have not been sealed yet. You many insert anything to seal it by pressing it in hand. Once sealed, the contents are inaccessible until cracked open (irreversible).")
+
+//Asks if you want to seal the biscuit, after you do that it behaves like normal paper biscuit.
+/obj/item/folder/biscuit/unsealed/attack_self(mob/user)
+ add_fingerprint(user)
+ if (!sealed)
+ if (tgui_alert(user, "Do you want to seal it? You must crack it open to reach the contents again!", "Biscuit Sealing", list("Yes", "No")) != "Yes")
+ return
+ cracked = FALSE
+ sealed = TRUE
+ playsound(get_turf(user), 'sound/items/tape.ogg', 60)
+ icon_state = "[not_cracked_icon]"
+ update_appearance()
+
+ return ..()
+
+/obj/item/folder/biscuit/unsealed/confidental
+ name = "\proper confidental biscuit card"
+ desc = "An confidental biscuit card. In a tasteful blue color with NT logo, looks like a chocolate bar. To reach contents you need to crack it open. Has label which says DO NOT DIGEST."
+ icon_state = "paperbiscuit_secret_cracked"
+ bg_color = "#355e9f"
+ not_cracked_icon = "paperbiscuit_secret"
diff --git a/code/modules/paperwork/folders_premade.dm b/code/modules/paperwork/folders_premade.dm
new file mode 100644
index 000000000000..a919dce944ce
--- /dev/null
+++ b/code/modules/paperwork/folders_premade.dm
@@ -0,0 +1,63 @@
+/obj/item/folder/blue
+ desc = "A blue folder."
+ icon_state = "folder_blue"
+
+/obj/item/folder/red
+ desc = "A red folder."
+ icon_state = "folder_red"
+
+/obj/item/folder/yellow
+ desc = "A yellow folder."
+ icon_state = "folder_yellow"
+
+/obj/item/folder/white
+ desc = "A white folder."
+ icon_state = "folder_white"
+
+/obj/item/folder/solgov
+ desc = "A blue folder with a SolGov seal."
+ icon_state = "folder_solgov"
+
+/obj/item/folder/terragov
+ desc = "A green folder with a Terran Regency seal."
+ icon_state = "folder_terragov"
+
+/obj/item/folder/syndicate
+ desc = "A folder with a Syndicate color scheme."
+ icon_state = "folder_syndie"
+
+/obj/item/folder/documents
+ var/document = /obj/item/documents/nanotrasen
+ name = "folder- 'TOP SECRET'"
+ desc = "A folder stamped \"Top Secret - Property of Nanotrasen Corporation. Unauthorized distribution is punishable by death.\""
+
+/obj/item/folder/documents/Initialize()
+ . = ..()
+ new document(src)
+ update_appearance()
+
+/obj/item/folder/documents/syndicate
+ icon_state = "folder_syndie"
+ name = "folder- 'TOP SECRET'"
+ desc = "A folder stamped \"Top Secret - Property of The Syndicate.\""
+
+/obj/item/folder/documents/syndicate/red
+ document = /obj/item/documents/syndicate/red
+ icon_state = "folder_sred"
+
+/obj/item/folder/documents/syndicate/blue
+ document = /obj/item/documents/syndicate/blue
+ icon_state = "folder_sblue"
+
+/obj/item/folder/documents/syndicate/mining
+ document = /obj/item/documents/syndicate/mining
+
+/obj/item/folder/documents/solgov
+ document = /obj/item/documents/solgov
+ desc = "A blue folder with a SolGov seal."
+ icon_state = "folder_solgovred"
+
+/obj/item/folder/documents/terragov
+ document = /obj/item/documents/terragov
+ desc = "A green folder with a Terran Regency seal."
+ icon_state = "folder_terragovred"
diff --git a/code/modules/projectiles/guns/gunhud.dm b/code/modules/projectiles/guns/gunhud.dm
new file mode 100644
index 000000000000..9d1a40db8bb6
--- /dev/null
+++ b/code/modules/projectiles/guns/gunhud.dm
@@ -0,0 +1,287 @@
+/*
+* Customizable ammo hud
+* - Adapted from SR's gun hud. Most of the bad stuff was cut out and sprites were mostly replace by some azlan did years ago.
+* - var names and code have been cleaned up, for the most parts. There still some weirdly named stuff like the number hud (wtf does OTH even mean?)
+* - Most of this SHOULDN'T be used yet, only instance of this being used at the moment is the revolver which has completely differnt behavior
+*/
+
+/*
+* This hud is controlled namely by the ammo_hud component. Generally speaking this is inactive much like all other hud components until it's needed.
+* It does not do any calculations of it's own, you must do this externally.
+* If you wish to use this hud, use the ammo_hud component or create another one which interacts with it via the below procs.
+* proc/turn_off
+* proc/turn_on
+* proc/set_hud
+* Check the gun_hud.dmi for all available icons you can use.
+*/
+
+// Ammo counter
+#define ui_ammocounter "EAST-1:28,CENTER+1:25"
+
+///The gun needs to update the gun hud!
+#define COMSIG_UPDATE_AMMO_HUD "update_ammo_hud"
+
+/datum/hud
+ var/atom/movable/screen/ammo_counter
+
+/atom/movable/screen/ammo_counter
+ name = "ammo counter"
+ icon = 'icons/hud/gun_hud.dmi'
+ icon_state = "backing"
+ screen_loc = ui_ammocounter
+ invisibility = INVISIBILITY_ABSTRACT
+
+ ///This is the color assigned to the OTH backing, numbers and indicator.
+ var/backing_color = COLOR_RED
+ /// The prefix used for the hud
+ var/prefix = ""
+
+ //Below are the OTH numbers, these are assigned by oX, tX and hX, x being the number you wish to display(0-9)
+ ///OTH position X00
+ var/oth_o
+ ///OTH position 0X0
+ var/oth_t
+ ///OTH position 00X
+ var/oth_h
+ ///This is the custom indicator sprite that will appear in the box at the bottom of the ammo hud, use this for something like semi/auto toggle on a gun.
+ var/indicator
+
+///This proc simply resets the hud to standard and removes it from the players visible hud.
+/atom/movable/screen/ammo_counter/proc/turn_off()
+ invisibility = INVISIBILITY_ABSTRACT
+ maptext = null
+ backing_color = COLOR_RED
+ oth_o = ""
+ oth_t = ""
+ oth_h = ""
+ indicator = ""
+ update_appearance()
+
+///This proc turns the hud on, but does not set it to anything other than the currently set values
+/atom/movable/screen/ammo_counter/proc/turn_on()
+ invisibility = 0
+
+///This is the main proc for altering the hud's appeareance, it controls the setting of the overlays. Use the OTH and below variables to set it accordingly.
+/atom/movable/screen/ammo_counter/proc/set_hud(_backing_color, _oth_o, _oth_t, _oth_h, _indicator)
+ backing_color = _backing_color
+ oth_o = _oth_o
+ oth_t = _oth_t
+ oth_h = _oth_h
+ indicator = _indicator
+
+ update_appearance()
+
+/atom/movable/screen/ammo_counter/update_overlays(list/rounds)
+ . = ..()
+ cut_overlays()
+ if(oth_o)
+ var/mutable_appearance/o_overlay = mutable_appearance(icon, oth_o)
+ o_overlay.color = backing_color
+ . += o_overlay
+ if(oth_t)
+ var/mutable_appearance/t_overlay = mutable_appearance(icon, oth_t)
+ t_overlay.color = backing_color
+ . += t_overlay
+ if(oth_h)
+ var/mutable_appearance/h_overlay = mutable_appearance(icon, oth_h)
+ h_overlay.color = backing_color
+ . += h_overlay
+ if(indicator)
+ var/mutable_appearance/indicator_overlay = mutable_appearance(icon, indicator)
+ indicator_overlay.color = backing_color
+ . += indicator_overlay
+ if(!rounds)
+ return
+
+ for(var/image/round as anything in rounds)
+ add_overlay(round)
+
+//*////////////////////////////////////////////////////////////////////////////////////////////////////////////*
+
+/datum/component/ammo_hud
+ var/atom/movable/screen/ammo_counter/hud
+ /// The prefix used for the hud
+ var/prefix = ""
+ var/backing_color = "#FFFFFF" // why was this hardcoded dlfhakhjdfj
+
+/datum/component/ammo_hud/Initialize()
+ . = ..()
+ if(!istype(parent, /obj/item/gun) && !istype(parent, /obj/item/weldingtool))
+ return COMPONENT_INCOMPATIBLE
+ RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, PROC_REF(wake_up))
+
+/datum/component/ammo_hud/Destroy()
+ turn_off()
+ return ..()
+
+/datum/component/ammo_hud/proc/wake_up(datum/source, mob/user, slot)
+ SIGNAL_HANDLER
+
+ if(ishuman(user))
+ var/mob/living/carbon/human/H = user
+ if(H.is_holding(parent))
+ if(H.hud_used)
+ hud = H.hud_used.ammo_counter
+ turn_on()
+ else
+ turn_off()
+
+/datum/component/ammo_hud/proc/turn_on()
+ SIGNAL_HANDLER
+
+ RegisterSignal(parent, COMSIG_ITEM_DROPPED, PROC_REF(turn_off))
+ RegisterSignal(parent, list(COMSIG_UPDATE_AMMO_HUD, COMSIG_GUN_CHAMBER_PROCESSED), PROC_REF(update_hud))
+
+ hud.turn_on()
+ update_hud()
+
+/datum/component/ammo_hud/proc/turn_off()
+ SIGNAL_HANDLER
+
+ UnregisterSignal(parent, list(COMSIG_ITEM_DROPPED, COMSIG_UPDATE_AMMO_HUD, COMSIG_GUN_CHAMBER_PROCESSED))
+
+ if(hud)
+ hud.turn_off()
+ hud = null
+
+/// Returns get_ammo() with the appropriate args passed to it - some guns like the revolver and bow are special cases
+/datum/component/ammo_hud/proc/get_accurate_ammo_count(obj/item/gun/ballistic/the_gun)
+ // fucking revolvers indeed - do not count empty or chambered rounds for the display HUD
+ if(istype(the_gun, /obj/item/gun/ballistic/revolver))
+ var/obj/item/gun/ballistic/revolver/the_revolver = the_gun
+ return the_revolver.get_ammo(countchambered = FALSE, countempties = FALSE)
+
+ // bows are also weird and shouldn't count the chambered
+ if(istype(the_gun, /obj/item/gun/ballistic/bow))
+ return the_gun.get_ammo(countchambered = FALSE)
+
+ return the_gun.get_ammo(countchambered = TRUE)
+
+/datum/component/ammo_hud/proc/get_accurate_laser_count(obj/item/gun/energy/the_gun)
+ var/obj/item/ammo_casing/energy/current_mode = the_gun.chambered
+ if(!current_mode)
+ return FALSE
+ return round(the_gun.cell.charge/current_mode.e_cost)
+
+/datum/component/ammo_hud/proc/update_hud()
+ SIGNAL_HANDLER
+ var/obj/item/gun/ballistic/pew = parent
+ hud.maptext = null
+ hud.icon_state = "[prefix]backing"
+ if(!pew.magazine)
+ hud.set_hud(backing_color, "[prefix]oe", "[prefix]te", "[prefix]he", "[prefix]no_mag")
+ return
+ if(!pew.get_ammo())
+ hud.set_hud(backing_color, "[prefix]oe", "[prefix]te", "[prefix]he", "[prefix]empty_flash")
+ return
+
+ var/indicator
+ var/rounds = num2text(get_accurate_ammo_count(pew))
+ var/oth_o
+ var/oth_t
+ var/oth_h
+
+ switch(length(rounds))
+ if(1)
+ oth_o = "[prefix]o[rounds[1]]"
+ if(2)
+ oth_o = "[prefix]o[rounds[2]]"
+ oth_t = "[prefix]t[rounds[1]]"
+ if(3)
+ oth_o = "[prefix]o[rounds[3]]"
+ oth_t = "[prefix]t[rounds[2]]"
+ oth_h = "[prefix]h[rounds[1]]"
+ else
+ oth_o = "[prefix]o9"
+ oth_t = "[prefix]t9"
+ oth_h = "[prefix]h9"
+ hud.set_hud(backing_color, oth_o, oth_t, oth_h, indicator)
+
+/datum/component/ammo_hud/laser/update_hud()
+ var/obj/item/gun/energy/pew = parent
+ hud.maptext = null
+ hud.icon_state = "[prefix]backing"
+ if(!pew.cell)
+ hud.set_hud(backing_color, "[prefix]oe", "[prefix]te", "[prefix]he", "[prefix]no_mag")
+ return
+ if(!get_accurate_laser_count(pew))
+ hud.set_hud(backing_color, "[prefix]oe", "[prefix]te", "[prefix]he", "[prefix]empty_flash")
+ return
+
+ var/indicator
+ var/rounds = num2text(get_accurate_laser_count(pew))
+ var/oth_o
+ var/oth_t
+ var/oth_h
+
+ switch(length(rounds))
+ if(1)
+ oth_o = "[prefix]o[rounds[1]]"
+ if(2)
+ oth_o = "[prefix]o[rounds[2]]"
+ oth_t = "[prefix]t[rounds[1]]"
+ if(3)
+ oth_o = "[prefix]o[rounds[3]]"
+ oth_t = "[prefix]t[rounds[2]]"
+ oth_h = "[prefix]h[rounds[1]]"
+ else
+ oth_o = "[prefix]o9"
+ oth_t = "[prefix]t9"
+ oth_h = "[prefix]h9"
+ hud.set_hud(backing_color, oth_o, oth_t, oth_h, indicator)
+
+/datum/component/ammo_hud/laser/cybersun
+ prefix = "cybersun_"
+
+/datum/component/ammo_hud/revolver
+ prefix = "revolver_"
+
+/// Returns get_ammo() with the appropriate args passed to it - some guns like the revolver and bow are special cases
+/datum/component/ammo_hud/revolver/get_accurate_ammo_count(obj/item/gun/ballistic/revolver/the_gun)
+ if(istype(the_gun, /obj/item/gun/ballistic/revolver))
+ var/obj/item/gun/ballistic/revolver/the_revolver = the_gun
+ if(the_revolver.magazine)
+ return the_revolver.magazine.ammo_list()
+
+/* //for counter-clockwise, kept here for reference
+ var/list/round_positions = list(
+ list("x" = 12,"y" = 22),
+
+ list("x" = 20,"y" = 17),
+ list("x" = 20,"y" = 7 ),
+ list("x" = 12,"y" = 2 ),
+ list("x" = 4 ,"y" = 7 ),
+ list("x" = 4 ,"y" = 17)
+ )
+*/
+
+/datum/component/ammo_hud/revolver/update_hud()
+ var/obj/item/gun/ballistic/revolver/pew = parent
+ hud.icon_state = "[prefix]backing"
+
+ var/list/rounds = get_accurate_ammo_count(pew)
+ var/list/round_images = list()
+ var/list/round_positions = list(
+ list("x" = 12,"y" = 22),
+
+ list("x" = 4 ,"y" = 17),
+ list("x" = 4 ,"y" = 7 ),
+ list("x" = 12,"y" = 2 ),
+ list("x" = 20,"y" = 7 ),
+ list("x" = 20,"y" = 17)
+
+ )
+
+ var/bullet_count = 0
+ for(var/obj/item/ammo_casing/bullet as anything in rounds)
+ bullet_count++
+ if(!bullet)
+ continue
+ var/image/current_bullet_image = image(icon = 'icons/hud/gun_hud.dmi')
+ var/list/bullet_position = round_positions[bullet_count]
+ current_bullet_image.pixel_x = bullet_position["x"]
+ current_bullet_image.pixel_y = bullet_position["y"]
+ current_bullet_image.icon_state = "revolver_casing[bullet.BB ? "_live" : ""]"
+ round_images += current_bullet_image
+
+ hud.update_overlays(round_images)
diff --git a/code/modules/surgery/limb_grafting.dm b/code/modules/surgery/limb_grafting.dm
new file mode 100644
index 000000000000..f3cc0d08d5c8
--- /dev/null
+++ b/code/modules/surgery/limb_grafting.dm
@@ -0,0 +1,117 @@
+// Formerly prosthetic_replacement.dm
+
+/datum/surgery/limb_grafting
+ name = "Limb grafting"
+ steps = list(/datum/surgery_step/incise, /datum/surgery_step/clamp_bleeders, /datum/surgery_step/retract_skin, /datum/surgery_step/graft_limb)
+ target_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey)
+ possible_locs = list(BODY_ZONE_R_ARM, BODY_ZONE_L_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG, BODY_ZONE_HEAD)
+ requires_bodypart = FALSE //need a missing limb
+ requires_bodypart_type = 0
+
+/datum/surgery/limb_grafting/can_start(mob/user, mob/living/carbon/target)
+ if(!iscarbon(target))
+ return 0
+ var/mob/living/carbon/C = target
+ if(!C.get_bodypart(user.zone_selected)) //can only start if limb is missing
+ return 1
+
+/datum/surgery_step/graft_limb
+ name = "graft limb"
+ implements = list(
+ /obj/item/bodypart = 100,
+ /obj/item/organ_storage = 100)
+// /obj/item/chainsaw = 100,
+// /obj/item/melee/synthetic_arm_blade = 100)
+// Frankly these have always bothered me. They fill like a bad fit for Shiptest.
+// Marking out for now. Keeping the later code used to install unconventional prostheses just in case someone finds a good use for it.
+
+ time = 32
+ experience_given = MEDICAL_SKILL_ORGAN_FIX //won't get full XP if rejected
+ var/organ_rejection_dam = 0
+
+/datum/surgery_step/graft_limb/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
+ if(istype(tool, /obj/item/organ_storage))
+ if(!tool.contents.len)
+ to_chat(user, "There is nothing inside [tool]!")
+ return -1
+ var/obj/item/I = tool.contents[1]
+ if(!isbodypart(I))
+ to_chat(user, "[I] cannot be attached!")
+ return -1
+ tool = I
+ if(istype(tool, /obj/item/bodypart))
+ var/obj/item/bodypart/BP = tool
+ if(ismonkey(target))// monkey patient only accept organic monkey limbs
+ if(!IS_ORGANIC_LIMB(BP) || BP.animal_origin != MONKEY_BODYPART)
+ to_chat(user, "[BP] doesn't match the patient's morphology.")
+ return -1
+ if(IS_ORGANIC_LIMB(BP))
+ organ_rejection_dam = 10
+ if(ishuman(target))
+ if(BP.animal_origin)
+ to_chat(user, "[BP] doesn't match the patient's morphology.")
+ return -1
+ var/mob/living/carbon/human/H = target
+ if(H.dna.species.id != BP.limb_id)
+ organ_rejection_dam = 30
+
+ if(target_zone == BP.body_zone) //so we can't replace a leg with an arm, or a human arm with a monkey arm.
+ display_results(user, target, "You begin to replace [target]'s [parse_zone(target_zone)] with [tool]...",
+ "[user] begins to replace [target]'s [parse_zone(target_zone)] with [tool].",
+ "[user] begins to replace [target]'s [parse_zone(target_zone)].")
+ else
+ to_chat(user, "[tool] isn't the right type for [parse_zone(target_zone)].")
+ return -1
+ else if(target_zone == BODY_ZONE_L_ARM || target_zone == BODY_ZONE_R_ARM)
+ display_results(user, target, "You begin to attach [tool] onto [target]...",
+ "[user] begins to attach [tool] onto [target]'s [parse_zone(target_zone)].",
+ "[user] begins to attach something onto [target]'s [parse_zone(target_zone)].")
+ else
+ to_chat(user, "[tool] must be installed onto an arm.")
+ return -1
+
+/datum/surgery_step/graft_limb/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery, default_display_results = FALSE)
+ . = ..()
+ if(istype(tool, /obj/item/organ_storage))
+ tool.icon_state = initial(tool.icon_state)
+ tool.desc = initial(tool.desc)
+ tool.cut_overlays()
+ tool = tool.contents[1]
+ if(istype(tool, /obj/item/bodypart) && user.temporarilyRemoveItemFromInventory(tool))
+ var/obj/item/bodypart/L = tool
+ if(!L.attach_limb(target))
+ display_results(user, target, "You fail in replacing [target]'s [parse_zone(target_zone)]! Their body has rejected [L]!",
+ "[user] fails to replace [target]'s [parse_zone(target_zone)]!",
+ "[user] fails to replaces [target]'s [parse_zone(target_zone)]!")
+ L.forceMove(target.loc)
+ return
+ if(organ_rejection_dam)
+ target.adjustToxLoss(organ_rejection_dam)
+ experience_given -= (round(organ_rejection_dam/10))
+ display_results(user, target, "You succeed in replacing [target]'s [parse_zone(target_zone)].",
+ "[user] successfully replaces [target]'s [parse_zone(target_zone)] with [tool]!",
+ "[user] successfully replaces [target]'s [parse_zone(target_zone)]!")
+ return
+ else
+ var/obj/item/bodypart/L = target.new_body_part(target_zone, FALSE, FALSE)
+ L.is_pseudopart = TRUE
+ if(!L.attach_limb(target))
+ display_results(user, target, "You fail in attaching [target]'s [parse_zone(target_zone)]! Their body has rejected [L]!",
+ "[user] fails to attach [target]'s [parse_zone(target_zone)]!",
+ "[user] fails to attach [target]'s [parse_zone(target_zone)]!")
+ L.forceMove(target.loc)
+ return
+ user.visible_message("[user] finishes attaching [tool]!", "You attach [tool].")
+ display_results(user, target, "You attach [tool].",
+ "[user] finishes attaching [tool]!",
+ "[user] finishes the attachment procedure!")
+ qdel(tool)
+ if(istype(tool, /obj/item/chainsaw))
+ var/obj/item/mounted_chainsaw/new_arm = new(target)
+ target_zone == BODY_ZONE_R_ARM ? target.put_in_r_hand(new_arm) : target.put_in_l_hand(new_arm)
+ return
+ else if(istype(tool, /obj/item/melee/synthetic_arm_blade))
+ var/obj/item/melee/arm_blade/new_arm = new(target,TRUE,TRUE)
+ target_zone == BODY_ZONE_R_ARM ? target.put_in_r_hand(new_arm) : target.put_in_l_hand(new_arm)
+ return
+ return ..() //if for some reason we fail everything we'll print out some text okay?
diff --git a/code/modules/unit_tests/icons/inhands.dm b/code/modules/unit_tests/icons/inhands.dm
new file mode 100644
index 000000000000..858c6d2f2840
--- /dev/null
+++ b/code/modules/unit_tests/icons/inhands.dm
@@ -0,0 +1,94 @@
+/// Makes sure items with defined item_states... actually have icons that exist!
+/datum/unit_test/defined_item_states
+ var/static/list/possible_icon_states = list()
+ var/fallback_log_message
+ var/unset_inhand_var_message
+ /// additional_inhands_location is for downstream modularity support. as an example, for skyrat's usage, set additional_inhands_location = "modular_skyrat/master_files/icons/mob/inhands/"
+ /// Make sure this location is also present in tools/deploy.sh
+ /// If you need additional paths ontop of this second one, you can add another generate_possible_icon_states_list("your/folder/path/inhands/") below the if(additional_inhands_location) block in Run(), and make sure to add that path to tools/deploy.sh as well.
+ var/additional_inhands_location = null
+
+/datum/unit_test/defined_item_states/proc/generate_possible_icon_states_list(directory_path)
+ if(!directory_path)
+ directory_path = "icons/mob/inhands/"
+ for(var/file_path in flist(directory_path))
+ if(findtext(file_path, ".dmi"))
+ for(var/sprite_icon in icon_states("[directory_path][file_path]", 1)) //2nd arg = 1 enables 64x64+ icon support, otherwise you'll end up with "sword0_1" instead of "sword"
+ possible_icon_states[sprite_icon] += list("[directory_path][file_path]")
+ else
+ possible_icon_states += generate_possible_icon_states_list("[directory_path][file_path]")
+
+/datum/unit_test/defined_item_states/Run()
+ generate_possible_icon_states_list()
+ if(additional_inhands_location)
+ generate_possible_icon_states_list(additional_inhands_location)
+
+ //Add EVEN MORE paths if needed here!
+ //generate_possible_icon_states_list("your/folder/path/inhands/")
+
+ for(var/obj/item/item_path as anything in subtypesof(/obj/item))
+ if(initial(item_path.item_flags) & ABSTRACT)
+ continue
+
+ var/skip_left
+ var/skip_right
+
+ var/lefthand_file = initial(item_path.lefthand_file)
+ var/righthand_file = initial(item_path.righthand_file)
+
+ var/item_state = initial(item_path.item_state)
+ if(!item_state)
+ var/base_icon_state = initial(item_path.icon_state)
+ if(!isnull(base_icon_state) && lefthand_file && righthand_file) //Suggest inhand icons that match with the icon_state var.
+ var/missing_var_message
+ if(base_icon_state in possible_icon_states)
+ for(var/file_place in possible_icon_states[base_icon_state])
+ missing_var_message += (missing_var_message ? " & '[file_place]'" : " - Possible matching sprites for \"[base_icon_state]\" found in: '[file_place]'")
+ unset_inhand_var_message += "\n\t[item_path] does not have an item_state value[missing_var_message]"
+ continue
+
+ var/match_message
+ if(item_state in possible_icon_states)
+ for(var/file_place in possible_icon_states[item_state])
+ match_message += (match_message ? " & '[file_place]'" : " - Matching sprite found in: '[file_place]'")
+
+ if(!(skip_left || skip_right) && !lefthand_file && !righthand_file)
+ TEST_FAIL("Missing both icon files for [item_path].\n\titem_state = \"[item_state]\"[match_message]")
+ continue
+
+ var/missing_left
+ var/left_fallback
+ if(!skip_left)
+ if(!lefthand_file)
+ TEST_FAIL("Missing left inhand icon file for [item_path].\n\titem_state = \"[item_state]\"[match_message]")
+ else
+ missing_left = !icon_exists(lefthand_file, item_state)
+ if(missing_left && icon_exists(lefthand_file, ""))
+ left_fallback = TRUE
+
+ var/missing_right
+ var/right_fallback
+ if(!skip_right)
+ if(!righthand_file)
+ TEST_FAIL("Missing right inhand icon file for [item_path].\n\titem_state = \"[item_state]\"[match_message]")
+ else
+ missing_right = !icon_exists(righthand_file, item_state)
+ if(missing_right && icon_exists(righthand_file, ""))
+ right_fallback = TRUE
+
+ if(missing_right && missing_left)
+ if(!match_message && right_fallback && left_fallback)
+ fallback_log_message += "\n\t[item_path] has invalid value, using fallback icon.\n\titem_state = \"[item_state]\""
+ continue
+ TEST_FAIL("Missing inhand sprites for [item_path] in both '[lefthand_file]' & '[righthand_file]'.\n\titem_state = \"[item_state]\"[match_message]")
+ else if(missing_left)
+ TEST_FAIL("Missing left inhand sprite for [item_path] in '[lefthand_file]'[left_fallback ? ", using fallback icon" : null].\n\titem_state = \"[item_state]\"[match_message]")
+ else if(missing_right)
+ TEST_FAIL("Missing right inhand sprite for [item_path] in '[righthand_file]'[right_fallback ? ", using fallback icon" : null].\n\titem_state = \"[item_state]\"[match_message]")
+
+ if(fallback_log_message)
+ TEST_FAIL("Invalid item_state values should be set to null if there isn't a valid icon.[fallback_log_message]")
+
+ if(unset_inhand_var_message)
+ log_test("\tNotice - Possible inhand icon matches found. It is best to be explicit with inhand sprite values.[unset_inhand_var_message]")
+
diff --git a/code/modules/unit_tests/icons/missing_icons.dm b/code/modules/unit_tests/icons/missing_icons.dm
new file mode 100644
index 000000000000..f548d2844a0f
--- /dev/null
+++ b/code/modules/unit_tests/icons/missing_icons.dm
@@ -0,0 +1,57 @@
+/// Makes sure objects actually have icons that exist!
+/datum/unit_test/missing_icons
+ var/static/list/possible_icon_states = list()
+ /// additional_icon_location is for downstream modularity support.
+ /// Make sure this location is also present in tools/deploy.sh
+ /// If you need additional paths ontop of this second one, you can add another generate_possible_icon_states_list("your/folder/path/") below the if(additional_icon_location) block in Run(), and make sure to add that path to tools/deploy.sh as well.
+ var/additional_icon_location = null
+
+/datum/unit_test/missing_icons/proc/generate_possible_icon_states_list(directory_path)
+ if(!directory_path)
+ directory_path = "icons/obj/"
+ for(var/file_path in flist(directory_path))
+ if(findtext(file_path, ".dmi"))
+ for(var/sprite_icon in icon_states("[directory_path][file_path]", 1)) //2nd arg = 1 enables 64x64+ icon support, otherwise you'll end up with "sword0_1" instead of "sword"
+ possible_icon_states[sprite_icon] += list("[directory_path][file_path]")
+ else
+ possible_icon_states += generate_possible_icon_states_list("[directory_path][file_path]")
+
+/datum/unit_test/missing_icons/Run()
+ generate_possible_icon_states_list()
+ generate_possible_icon_states_list("icons/effects/")
+ if(additional_icon_location)
+ generate_possible_icon_states_list(additional_icon_location)
+
+ //Add EVEN MORE paths if needed here!
+ //generate_possible_icon_states_list("your/folder/path/")
+ var/list/bad_list = list()
+ for(var/obj/obj_path as anything in subtypesof(/obj))
+ if(ispath(obj_path, /obj/item))
+ var/obj/item/item_path = obj_path
+ if(initial(item_path.item_flags) & ABSTRACT)
+ continue
+
+ var/icon = initial(obj_path.icon)
+ if(isnull(icon))
+ continue
+ var/icon_state = initial(obj_path.icon_state)
+ if(isnull(icon_state))
+ continue
+
+ if(length(bad_list) && (icon_state in bad_list[icon]))
+ continue
+
+ if(icon_exists(icon, icon_state))
+ continue
+
+ if(icon_state == "nothing")
+ continue
+
+ bad_list[icon] += list(icon_state)
+
+ var/match_message
+ if(icon_state in possible_icon_states)
+ for(var/file_place in possible_icon_states[icon_state])
+ match_message += (match_message ? " & '[file_place]'" : " - Matching sprite found in: '[file_place]'")
+ TEST_FAIL("Missing icon_state for [obj_path] in '[icon]'.\n\ticon_state = \"[icon_state]\"[match_message]")
+
diff --git a/code/modules/unit_tests/icons/spritesheets.dm b/code/modules/unit_tests/icons/spritesheets.dm
new file mode 100644
index 000000000000..c7c16c6535e8
--- /dev/null
+++ b/code/modules/unit_tests/icons/spritesheets.dm
@@ -0,0 +1,11 @@
+///Checks if spritesheet assets contain icon states with invalid names
+/datum/unit_test/spritesheets
+
+/datum/unit_test/spritesheets/Run()
+ for(var/datum/asset/spritesheet/sheet as anything in subtypesof(/datum/asset/spritesheet))
+ if(!initial(sheet.name)) //Ignore abstract types
+ continue
+ sheet = get_asset_datum(sheet)
+ for(var/sprite_name in sheet.sprites)
+ if(!sprite_name)
+ TEST_FAIL("Spritesheet [sheet.type] has a nameless icon state.")
diff --git a/code/modules/unit_tests/icons/worn_icons.dm b/code/modules/unit_tests/icons/worn_icons.dm
new file mode 100644
index 000000000000..eb2d84b73f68
--- /dev/null
+++ b/code/modules/unit_tests/icons/worn_icons.dm
@@ -0,0 +1,116 @@
+/// Makes sure suit slot items aren't using CS:S fallbacks.
+/datum/unit_test/mob_overlay_icons
+ var/static/list/possible_icon_states = list()
+ /// additional_icon_location is for downstream modularity support for finding missing sprites in additonal DMI file locations.
+ /// Make sure this location is also present in tools/deploy.sh
+ /// If you need additional paths ontop of this second one, you can add another generate_possible_icon_states_list("your/folder/path/") below the if(additional_icon_location) block in Run(), and make sure to add that path to tools/deploy.sh as well.
+ var/additional_icon_location = null
+
+/datum/unit_test/mob_overlay_icons/proc/generate_possible_icon_states_list(directory_path)
+ if(!directory_path)
+ directory_path = "icons/mob/clothing/"
+ for(var/file_path in flist(directory_path))
+ if(findtext(file_path, ".dmi"))
+ for(var/sprite_icon in icon_states("[directory_path][file_path]", 1)) //2nd arg = 1 enables 64x64+ icon support, otherwise you'll end up with "sword0_1" instead of "sword"
+ possible_icon_states[sprite_icon] += list("[directory_path][file_path]")
+ else
+ possible_icon_states += generate_possible_icon_states_list("[directory_path][file_path]")
+
+/datum/unit_test/mob_overlay_icons/Run()
+ generate_possible_icon_states_list()
+ if(additional_icon_location)
+ generate_possible_icon_states_list(additional_icon_location)
+
+ var/list/already_warned_icons = list()
+
+ for(var/obj/item/item_path as anything in (subtypesof(/obj/item/clothing)))
+ var/cached_slot_flags = initial(item_path.slot_flags)
+ if(!cached_slot_flags || (cached_slot_flags & ITEM_SLOT_LPOCKET) || (cached_slot_flags & ITEM_SLOT_RPOCKET) || initial(item_path.item_flags) & ABSTRACT)
+ continue
+
+ var/mob_overlay_icon = initial(item_path.mob_overlay_icon) //override icon file. where our sprite is contained if set. (ie modularity stuff)
+ var/mob_overlay_state = initial(item_path.mob_overlay_state) //overrides icon_state.
+ var/icon_state = mob_overlay_state || initial(item_path.icon_state) //icon_state. what sprite name we are looking for.
+
+
+ if(isnull(icon_state))
+ continue //no sprite for the item.
+ if(icon_state in already_warned_icons)
+ continue
+
+ var/match_message
+ if(icon_state in possible_icon_states)
+ for(var/file_place in possible_icon_states[icon_state])
+ match_message += (match_message ? " & '[file_place]'" : " - Matching sprite found in: '[file_place]'")
+
+ if(mob_overlay_icon) //easiest to check since we override everything. this automatically includes downstream support.
+ if(!(icon_state in icon_states(mob_overlay_icon, 1)))
+ TEST_FAIL("[item_path] using invalid [mob_overlay_state ? "mob_overlay_state" : "icon_state"], \"[icon_state]\" in mob_overlay_icon override file, '[mob_overlay_icon]'[match_message]")
+ continue
+
+ var/icon_file //checks against all the default icon locations if one isn't defined.
+ var/fail_reasons
+ var/spacer
+
+
+ if(cached_slot_flags & ITEM_SLOT_BACK)
+ icon_file = 'icons/mob/clothing/back.dmi'
+
+ if(!(icon_state in icon_states(icon_file, 1)))
+ already_warned_icons += icon_state
+ fail_reasons += "[item_path] using invalid [mob_overlay_state ? "mob_overlay_state" : "icon_state"], \"[icon_state]\" in '[icon_file]'[match_message]"
+ spacer = "\n\t"
+
+ /*
+ if(cached_slot_flags & ITEM_SLOT_ID)
+ icon_file = 'icons/mob/clothing/id.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]"
+ spacer = "\n\t"
+ */
+
+ if(cached_slot_flags & ITEM_SLOT_GLOVES)
+ icon_file = 'icons/mob/clothing/hands.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]"
+ spacer = "\n\t"
+
+ if(cached_slot_flags & ITEM_SLOT_EYES)
+ icon_file = 'icons/mob/clothing/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]"
+ spacer = "\n\t"
+
+ if(cached_slot_flags & ITEM_SLOT_EARS)
+ icon_file = 'icons/mob/clothing/ears.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]"
+ spacer = "\n\t"
+
+ if(cached_slot_flags & ITEM_SLOT_NECK)
+ icon_file = 'icons/mob/clothing/neck.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]"
+ spacer = "\n\t"
+
+ if(cached_slot_flags & ITEM_SLOT_MASK)
+ icon_file = 'icons/mob/clothing/mask.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]"
+ spacer = "\n\t"
+
+ if(cached_slot_flags & ITEM_SLOT_BELT)
+ icon_file = 'icons/mob/clothing/belt.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]"
+ spacer = "\n\t"
+
+ if(fail_reasons)
+ TEST_FAIL(fail_reasons)
diff --git a/html/changelogs/archive/2024-04.yml b/html/changelogs/archive/2024-04.yml
new file mode 100644
index 000000000000..277ae650feb3
--- /dev/null
+++ b/html/changelogs/archive/2024-04.yml
@@ -0,0 +1,76 @@
+2024-04-01:
+ phoaly, coleminerman, MeeMofCourse, Retlaw34:
+ - rscadd: Added the Crying Sun-class
+ - rscadd: Added PGF comms
+2024-04-02:
+ goober3:
+ - tweak: Blood Cult content has been removed from all maps.
+ - rscdel: Jungle_demon.dmm, jungle_witch.dmm, lavaland_surface_cultaltar.dmm, lavaland_surface_fuckedupandevilclub.dmm,
+ clericden.dmm, and rockplanet_cult.dmm have been removed.
+ - tweak: Onehalf.dmm, rockplanet_crash_cult.dmm & icemoon_underground_abandoned_village.dmm
+ have been reworked slightly, to feature no more magic.
+2024-04-08:
+ Apogee-dev:
+ - tweak: Remapped the Shetland
+ - balance: Removed RnD and ORM from Shetland
+ phoaly:
+ - tweak: tweaks supplies and kills the wall laptop on the Ranger
+2024-04-09:
+ Imaginos16, spookywastaken:
+ - rscadd: Resprites a ton of gun magazines
+ - bugfix: Changes how magainzes with only a empty and loaded state are
+2024-04-12:
+ Gristlebee:
+ - rscadd: Punching bags can be built with 5 cloth.
+ - rscadd: Bench press and chest press can be built with 5 metal.
+ - rscadd: Exercise equipment can be deconstructed.
+ Martinpachu:
+ - bugfix: Fixes MAA on the Colossus not being able to access the bridge.
+ Sadhorizon:
+ - tweak: Random blood packs now can roll Elzu and IPC blood.
+ SomeguyManperson:
+ - bugfix: anesthetic can no longer semi permanently knock people out
+ Yata9ar4su:
+ - rscadd: Fullscreen on F11
+ Zxaber:
+ - tweak: You can now use drop / use inhand hotkey to retract and deploy arm implants
+ meemofcourse:
+ - rscadd: Long-range bluespace technologies in fax machines now allow the faxing
+ of photos. I am not responsible for any consequences that might result from
+ sending your faction's command personnel a photo of your character's ass.
+ phoaly:
+ - rscdel: Removed some old ships
+ - tweak: Aspawned the Lagoon and Junker
+ sapphicoverload, PestoVerde322, PacifistDalek:
+ - rscadd: turbines now provide thrust for ships
+ - tweak: turbines respect conservation of energy instead of moving gas around for
+ free
+ - tweak: turbine control console now shows the internal pressure of the turbine
+ - code_imp: refactored how gas flows through the turbine
+ - bugfix: fixed turbines making free energy from nowhere at low RPM
+ - bugfix: fixed turbines forcing air into the output turf when it's blocked
+ - bugfix: fixed turbines not updating air at the input and output turfs
+ - bugfix: fixed turbines disconnecting when docking and undocking
+ - imageadd: new turbine sprites
+ thgvr:
+ - rscadd: Suicide & Execution with a damaging firearm is now more deadly and gruesome.
+2024-04-13:
+ FalloutFalcon:
+ - tweak: all radios start off
+ - tweak: all survival boxs start with a radio
+ Sun-Soaked:
+ - rscadd: Redesigns landmines as an item that can be picked up, disarmed, deployed.
+ Some logic courtesy of /tg/.
+ - rscadd: Adds a proximity explosive variant of landmines.
+ - bugfix: shrapnel embedding once again respects targeted limb and no longer runtimes
+ on hitting a wall or destroying an object.
+ - bugfix: storage can no longer pick up anchored objects, causing them to get stuck
+ inside
+ - balance: Nerfs the ability of heavy explosions to immediately breach to space
+ - soundadd: adds two mine detonation noises
+ - code_imp: moves weapon manufacturer defines to a DEFINE file
+ generalthrax:
+ - rscadd: Etherbor SG-8 Beam Pistol to cargo for 1000 credits
+ - rscadd: Etherbor BG-12 Beam Rifle to cargo for 3000 credits
+ - rscadd: Etherbor civilian weapon cells for 600 credits, slightly higher capacity
+ than the generic cells
diff --git a/icons/hud/gun_hud.dmi b/icons/hud/gun_hud.dmi
new file mode 100644
index 000000000000..a24f7f2964f3
Binary files /dev/null and b/icons/hud/gun_hud.dmi differ
diff --git a/icons/mob/clothing/faction/clip/accessory.dmi b/icons/mob/clothing/faction/clip/accessory.dmi
new file mode 100644
index 000000000000..733bb3d863e0
Binary files /dev/null and b/icons/mob/clothing/faction/clip/accessory.dmi differ
diff --git a/icons/mob/clothing/faction/clip/belt.dmi b/icons/mob/clothing/faction/clip/belt.dmi
new file mode 100644
index 000000000000..befce1b54b10
Binary files /dev/null and b/icons/mob/clothing/faction/clip/belt.dmi differ
diff --git a/icons/mob/clothing/faction/clip/hands.dmi b/icons/mob/clothing/faction/clip/hands.dmi
new file mode 100644
index 000000000000..8e35e752ab8c
Binary files /dev/null and b/icons/mob/clothing/faction/clip/hands.dmi differ
diff --git a/icons/mob/clothing/faction/clip/head.dmi b/icons/mob/clothing/faction/clip/head.dmi
new file mode 100644
index 000000000000..2122a9a2f328
Binary files /dev/null and b/icons/mob/clothing/faction/clip/head.dmi differ
diff --git a/icons/mob/clothing/faction/clip/mask.dmi b/icons/mob/clothing/faction/clip/mask.dmi
new file mode 100644
index 000000000000..a46424e63096
Binary files /dev/null and b/icons/mob/clothing/faction/clip/mask.dmi differ
diff --git a/icons/mob/clothing/faction/clip/suits.dmi b/icons/mob/clothing/faction/clip/suits.dmi
new file mode 100644
index 000000000000..f7a64dc8b320
Binary files /dev/null and b/icons/mob/clothing/faction/clip/suits.dmi differ
diff --git a/icons/mob/clothing/faction/clip/uniforms.dmi b/icons/mob/clothing/faction/clip/uniforms.dmi
new file mode 100644
index 000000000000..71ad9e1b6a3e
Binary files /dev/null and b/icons/mob/clothing/faction/clip/uniforms.dmi differ
diff --git a/icons/mob/inhands/clothing/ears_lefthand.dmi b/icons/mob/inhands/clothing/ears_lefthand.dmi
new file mode 100644
index 000000000000..61b186a7b21c
Binary files /dev/null and b/icons/mob/inhands/clothing/ears_lefthand.dmi differ
diff --git a/icons/mob/inhands/clothing/ears_righthand.dmi b/icons/mob/inhands/clothing/ears_righthand.dmi
new file mode 100644
index 000000000000..39558ef9496e
Binary files /dev/null and b/icons/mob/inhands/clothing/ears_righthand.dmi differ
diff --git a/icons/mob/inhands/clothing/glasses_lefthand.dmi b/icons/mob/inhands/clothing/glasses_lefthand.dmi
new file mode 100644
index 000000000000..34c9e47dc24b
Binary files /dev/null and b/icons/mob/inhands/clothing/glasses_lefthand.dmi differ
diff --git a/icons/mob/inhands/clothing/glasses_righthand.dmi b/icons/mob/inhands/clothing/glasses_righthand.dmi
new file mode 100644
index 000000000000..43282d028c6a
Binary files /dev/null and b/icons/mob/inhands/clothing/glasses_righthand.dmi differ
diff --git a/icons/mob/inhands/clothing/gloves_lefthand.dmi b/icons/mob/inhands/clothing/gloves_lefthand.dmi
new file mode 100644
index 000000000000..19d3ce28517e
Binary files /dev/null and b/icons/mob/inhands/clothing/gloves_lefthand.dmi differ
diff --git a/icons/mob/inhands/clothing/gloves_righthand.dmi b/icons/mob/inhands/clothing/gloves_righthand.dmi
new file mode 100644
index 000000000000..bca7fd504359
Binary files /dev/null and b/icons/mob/inhands/clothing/gloves_righthand.dmi differ
diff --git a/icons/mob/inhands/clothing/hats_lefthand.dmi b/icons/mob/inhands/clothing/hats_lefthand.dmi
new file mode 100644
index 000000000000..d63c5c7d673a
Binary files /dev/null and b/icons/mob/inhands/clothing/hats_lefthand.dmi differ
diff --git a/icons/mob/inhands/clothing/hats_righthand.dmi b/icons/mob/inhands/clothing/hats_righthand.dmi
new file mode 100644
index 000000000000..c34438f09928
Binary files /dev/null and b/icons/mob/inhands/clothing/hats_righthand.dmi differ
diff --git a/icons/mob/inhands/clothing/masks_lefthand.dmi b/icons/mob/inhands/clothing/masks_lefthand.dmi
new file mode 100644
index 000000000000..33be3dfee0b5
Binary files /dev/null and b/icons/mob/inhands/clothing/masks_lefthand.dmi differ
diff --git a/icons/mob/inhands/clothing/masks_righthand.dmi b/icons/mob/inhands/clothing/masks_righthand.dmi
new file mode 100644
index 000000000000..e34e8cdd2c72
Binary files /dev/null and b/icons/mob/inhands/clothing/masks_righthand.dmi differ
diff --git a/icons/mob/inhands/clothing/shoes_lefthand.dmi b/icons/mob/inhands/clothing/shoes_lefthand.dmi
new file mode 100644
index 000000000000..7e1a796f1fcf
Binary files /dev/null and b/icons/mob/inhands/clothing/shoes_lefthand.dmi differ
diff --git a/icons/mob/inhands/clothing/shoes_righthand.dmi b/icons/mob/inhands/clothing/shoes_righthand.dmi
new file mode 100644
index 000000000000..383f01dc49be
Binary files /dev/null and b/icons/mob/inhands/clothing/shoes_righthand.dmi differ
diff --git a/icons/mob/inhands/clothing/suits_lefthand.dmi b/icons/mob/inhands/clothing/suits_lefthand.dmi
new file mode 100644
index 000000000000..8b9fa5256a93
Binary files /dev/null and b/icons/mob/inhands/clothing/suits_lefthand.dmi differ
diff --git a/icons/mob/inhands/clothing/suits_righthand.dmi b/icons/mob/inhands/clothing/suits_righthand.dmi
new file mode 100644
index 000000000000..989b7c0860ae
Binary files /dev/null and b/icons/mob/inhands/clothing/suits_righthand.dmi differ
diff --git a/icons/obj/atmospherics/components/turbine.dmi b/icons/obj/atmospherics/components/turbine.dmi
new file mode 100644
index 000000000000..6e499911a75b
Binary files /dev/null and b/icons/obj/atmospherics/components/turbine.dmi differ
diff --git a/icons/obj/clothing/faction/clip/accessory.dmi b/icons/obj/clothing/faction/clip/accessory.dmi
new file mode 100644
index 000000000000..dd081c9f9ca8
Binary files /dev/null and b/icons/obj/clothing/faction/clip/accessory.dmi differ
diff --git a/icons/obj/clothing/faction/clip/belt.dmi b/icons/obj/clothing/faction/clip/belt.dmi
new file mode 100644
index 000000000000..bd513a28c2f2
Binary files /dev/null and b/icons/obj/clothing/faction/clip/belt.dmi differ
diff --git a/icons/obj/clothing/faction/clip/hands.dmi b/icons/obj/clothing/faction/clip/hands.dmi
new file mode 100644
index 000000000000..ad3700cf5f61
Binary files /dev/null and b/icons/obj/clothing/faction/clip/hands.dmi differ
diff --git a/icons/obj/clothing/faction/clip/head.dmi b/icons/obj/clothing/faction/clip/head.dmi
new file mode 100644
index 000000000000..3982f324b9a2
Binary files /dev/null and b/icons/obj/clothing/faction/clip/head.dmi differ
diff --git a/icons/obj/clothing/faction/clip/mask.dmi b/icons/obj/clothing/faction/clip/mask.dmi
new file mode 100644
index 000000000000..646c90868cdd
Binary files /dev/null and b/icons/obj/clothing/faction/clip/mask.dmi differ
diff --git a/icons/obj/clothing/faction/clip/suits.dmi b/icons/obj/clothing/faction/clip/suits.dmi
new file mode 100644
index 000000000000..16390028fee7
Binary files /dev/null and b/icons/obj/clothing/faction/clip/suits.dmi differ
diff --git a/icons/obj/clothing/faction/clip/uniforms.dmi b/icons/obj/clothing/faction/clip/uniforms.dmi
new file mode 100644
index 000000000000..c736bc109bf8
Binary files /dev/null and b/icons/obj/clothing/faction/clip/uniforms.dmi differ
diff --git a/icons/obj/drinks/bottle.dmi b/icons/obj/drinks/bottle.dmi
new file mode 100644
index 000000000000..cf74d73796c8
Binary files /dev/null and b/icons/obj/drinks/bottle.dmi differ
diff --git a/icons/obj/drinks/drinks.dmi b/icons/obj/drinks/drinks.dmi
new file mode 100644
index 000000000000..03fdf63dd00b
Binary files /dev/null and b/icons/obj/drinks/drinks.dmi differ
diff --git a/icons/obj/implants/implant.dmi b/icons/obj/implants/implant.dmi
new file mode 100644
index 000000000000..31bd68db0caf
Binary files /dev/null and b/icons/obj/implants/implant.dmi differ
diff --git a/icons/obj/landmine.dmi b/icons/obj/landmine.dmi
new file mode 100644
index 000000000000..dd19fd9d3991
Binary files /dev/null and b/icons/obj/landmine.dmi differ
diff --git a/icons/stamp_icons/large_stamp-clip.png b/icons/stamp_icons/large_stamp-clip.png
new file mode 100644
index 000000000000..82872f034be5
Binary files /dev/null and b/icons/stamp_icons/large_stamp-clip.png differ
diff --git a/sound/items/mine_activate.ogg b/sound/items/mine_activate.ogg
new file mode 100644
index 000000000000..ed39ba283be7
Binary files /dev/null and b/sound/items/mine_activate.ogg differ
diff --git a/sound/items/mine_activate_short.ogg b/sound/items/mine_activate_short.ogg
new file mode 100644
index 000000000000..8c6e81a06bbe
Binary files /dev/null and b/sound/items/mine_activate_short.ogg differ
diff --git a/sound/misc/trenchwhistle.ogg b/sound/misc/trenchwhistle.ogg
new file mode 100644
index 000000000000..24ca6772547a
Binary files /dev/null and b/sound/misc/trenchwhistle.ogg differ
diff --git a/sound/roundend/boowomp.ogg b/sound/roundend/boowomp.ogg
new file mode 100644
index 000000000000..1a1ed5878b10
Binary files /dev/null and b/sound/roundend/boowomp.ogg differ
diff --git a/sound/roundend/deliguana.ogg b/sound/roundend/deliguana.ogg
new file mode 100644
index 000000000000..058900271040
Binary files /dev/null and b/sound/roundend/deliguana.ogg differ
diff --git a/sound/roundend/gayrights.ogg b/sound/roundend/gayrights.ogg
new file mode 100644
index 000000000000..230a421f0096
Binary files /dev/null and b/sound/roundend/gayrights.ogg differ
diff --git a/sound/roundend/repair.ogg b/sound/roundend/repair.ogg
new file mode 100644
index 000000000000..756abb5a4b7c
Binary files /dev/null and b/sound/roundend/repair.ogg differ
diff --git a/sound/roundend/shiptestingthursday.ogg b/sound/roundend/shiptestingthursday.ogg
new file mode 100644
index 000000000000..9943d78f7262
Binary files /dev/null and b/sound/roundend/shiptestingthursday.ogg differ
diff --git a/sound/roundend/undecided.ogg b/sound/roundend/undecided.ogg
new file mode 100644
index 000000000000..604cbe8b6dc9
Binary files /dev/null and b/sound/roundend/undecided.ogg differ
diff --git a/sound/roundstart/addiguana.ogg b/sound/roundstart/addiguana.ogg
new file mode 100644
index 000000000000..8b21b9835516
Binary files /dev/null and b/sound/roundstart/addiguana.ogg differ
diff --git a/sound/weapons/gun/laser/cs-fire.ogg b/sound/weapons/gun/laser/cs-fire.ogg
new file mode 100644
index 000000000000..a773bd203d12
Binary files /dev/null and b/sound/weapons/gun/laser/cs-fire.ogg differ
diff --git a/sound/weapons/gun/revolver/spin_single.ogg b/sound/weapons/gun/revolver/spin_single.ogg
new file mode 100644
index 000000000000..46cbcb2ad5dc
Binary files /dev/null and b/sound/weapons/gun/revolver/spin_single.ogg differ
diff --git a/tgui/packages/tgui/interfaces/Clipboard.js b/tgui/packages/tgui/interfaces/Clipboard.js
new file mode 100644
index 000000000000..82e9001335da
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/Clipboard.js
@@ -0,0 +1,107 @@
+import { useBackend } from '../backend';
+import {
+ Box,
+ Button,
+ Divider,
+ LabeledList,
+ Flex,
+ Section,
+} from '../components';
+import { Window } from '../layouts';
+
+export const Clipboard = (props, context) => {
+ const { act, data } = useBackend(context);
+ const { pen, top_paper, top_paper_ref, paper, paper_ref } = data;
+ return (
+
+
+
+ {pen ? (
+
+ act('remove_pen')} />
+ }
+ >
+ {pen}
+
+
+ ) : (
+
+ No pen attached!
+
+ )}
+
+
+ {top_paper ? (
+
+
+ {top_paper}
+
+
+
+
+ ) : (
+
+
+ The clipboard is empty!
+
+
+ )}
+ {paper.length > 0 && }
+ {paper.map((paper_item, index) => (
+
+
+
+
+ {paper_item}
+
+
+
+
+ ))}
+
+
+ );
+};
diff --git a/tgui/packages/tgui/interfaces/Folder.js b/tgui/packages/tgui/interfaces/Folder.js
new file mode 100644
index 000000000000..affdb35ee7ae
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/Folder.js
@@ -0,0 +1,51 @@
+import { useBackend } from '../backend';
+import { Box, Button, Flex, Section } from '../components';
+import { Window } from '../layouts';
+
+export const Folder = (props, context) => {
+ const { act, data } = useBackend(context);
+ const { theme, bg_color, folder_name, contents, contents_ref } = data;
+ return (
+
+
+ {contents.map((item, index) => (
+
+
+ {item}
+
+
+ {
+
+
+ ))}
+ {contents.length === 0 && (
+
+
+ This folder is empty!
+
+
+ )}
+
+
+ );
+};
diff --git a/tgui/packages/tgui/interfaces/ShipOwner.tsx b/tgui/packages/tgui/interfaces/ShipOwner.tsx
new file mode 100644
index 000000000000..3beab28f48b0
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/ShipOwner.tsx
@@ -0,0 +1,266 @@
+import { useBackend, useLocalState } from '../backend';
+import {
+ Button,
+ LabeledList,
+ Section,
+ Table,
+ Tabs,
+ Divider,
+} from '../components';
+import { Window } from '../layouts';
+
+type ShipOwnerData = {
+ crew: [CrewData];
+ jobs: [JobData];
+ jobIncreaseAllowed: [string];
+ memo: string;
+ pending: boolean;
+ joinMode: string;
+ cooldown: number;
+ applications: [ApplicationData];
+ isAdmin: boolean;
+};
+
+type ApplicationData = {
+ ref: string;
+ key: string;
+ name: string;
+ text: string;
+ status: string;
+};
+
+type CrewData = {
+ ref: string;
+ name: string;
+ allowed: boolean;
+};
+
+type JobData = {
+ ref: string;
+ name: string;
+ slots: number;
+ max: number;
+ def: number;
+};
+
+export const ShipOwner = (props, context) => {
+ return (
+
+
+
+
+
+ );
+};
+
+const ShipOwnerContent = (_, context: any) => {
+ const { act, data } = useBackend(context);
+ const [tab, setTab] = useLocalState(context, 'tab', 1);
+ const {
+ crew = [],
+ jobs = [],
+ memo,
+ pending,
+ joinMode,
+ cooldown = 1,
+ applications = [],
+ isAdmin,
+ jobIncreaseAllowed = [],
+ } = data;
+ return (
+
+ setTab(1)}>
+ Ship, Applications
+
+ setTab(2)}>
+ Ship Owner Options
+
+ setTab(3)}>
+ Job Slots
+
+
+ }
+ >
+ {(!memo || memo.length <= 0) && (
+
+