stationary_dock.dwidth)
- return SHUTTLE_DWIDTH_TOO_LARGE
-
- if(width-dwidth > stationary_dock.width-stationary_dock.dwidth)
- return SHUTTLE_WIDTH_TOO_LARGE
-
- if(dheight > stationary_dock.dheight)
- return SHUTTLE_DHEIGHT_TOO_LARGE
-
- if(height-dheight > stationary_dock.height-stationary_dock.dheight)
- return SHUTTLE_HEIGHT_TOO_LARGE
-
- //check the dock isn't occupied
- var/currently_docked = stationary_dock.get_docked()
- if(currently_docked)
- // by someone other than us
- if(currently_docked != src)
- return SHUTTLE_SOMEONE_ELSE_DOCKED
- else
- // This isn't an error, per se, but we can't let the shuttle code
- // attempt to move us where we currently are, it will get weird.
- return SHUTTLE_ALREADY_DOCKED
-
- return SHUTTLE_CAN_DOCK
-
-/obj/docking_port/mobile/proc/check_dock(obj/docking_port/stationary/S, silent = FALSE)
- var/status = canDock(S)
- if(status == SHUTTLE_CAN_DOCK)
- return TRUE
- else
- if(status != SHUTTLE_ALREADY_DOCKED && !silent) // SHUTTLE_ALREADY_DOCKED is no cause for error
- message_admins("Shuttle [src] cannot dock at [S], error: [status]")
- // We're already docked there, don't need to do anything.
- // Triggering shuttle movement code in place is weird
- return FALSE
-
-/obj/docking_port/mobile/proc/transit_failure()
- message_admins("Shuttle [src] repeatedly failed to create transit zone.")
-
-/**
- * Calls the shuttle to the destination port, respecting its ignition and call timers
- *
- * Arguments:
- * * destination_port - Stationary docking port to move the shuttle to
- */
-/obj/docking_port/mobile/proc/request(obj/docking_port/stationary/destination_port)
- if(!check_dock(destination_port))
- testing("check_dock failed on request for [src]")
- return
-
- if(mode == SHUTTLE_IGNITING && destination == destination_port)
- return
-
- switch(mode)
- if(SHUTTLE_CALL)
- if(destination_port == destination)
- if(timeLeft(1) < callTime * engine_coeff)
- setTimer(callTime * engine_coeff)
- else
- destination = destination_port
- setTimer(callTime * engine_coeff)
- if(SHUTTLE_RECALL)
- if(destination_port == destination)
- setTimer(callTime * engine_coeff - timeLeft(1))
- else
- destination = destination_port
- setTimer(callTime * engine_coeff)
- mode = SHUTTLE_CALL
- if(SHUTTLE_IDLE, SHUTTLE_IGNITING)
- destination = destination_port
- mode = SHUTTLE_IGNITING
- setTimer(ignitionTime)
-
-//recall the shuttle to where it was previously
-/obj/docking_port/mobile/proc/cancel()
- if(mode != SHUTTLE_CALL)
- return
-
- remove_ripples()
-
- invertTimer()
- mode = SHUTTLE_RECALL
-
-/obj/docking_port/mobile/proc/enterTransit()
- if((SSshuttle.lockdown && is_station_level(z)) || !canMove()) //emp went off, no escape
- mode = SHUTTLE_IDLE
- return
- previous = null
- if(!destination)
- // sent to transit with no destination -> unlimited timer
- timer = INFINITY
- var/obj/docking_port/stationary/S0 = get_docked()
- var/obj/docking_port/stationary/S1 = assigned_transit
- if(S1)
- if(initiate_docking(S1) != DOCKING_SUCCESS)
- WARNING("shuttle \"[shuttle_id]\" could not enter transit space. Docked at [S0 ? S0.shuttle_id : "null"]. Transit dock [S1 ? S1.shuttle_id : "null"].")
- else if(S0)
- if(S0.delete_after)
- qdel(S0, TRUE)
- else
- previous = S0
- else
- WARNING("shuttle \"[shuttle_id]\" could not enter transit space. S0=[S0 ? S0.shuttle_id : "null"] S1=[S1 ? S1.shuttle_id : "null"]")
-
-
-/obj/docking_port/mobile/proc/jumpToNullSpace()
- // Destroys the docking port and the shuttle contents.
- // Not in a fancy way, it just ceases.
- var/obj/docking_port/stationary/current_dock = get_docked()
-
- var/underlying_area_type = SHUTTLE_DEFAULT_UNDERLYING_AREA
- // If the shuttle is docked to a stationary port, restore its normal
- // "empty" area and turf
- if(current_dock?.area_type)
- underlying_area_type = current_dock.area_type
-
- var/list/old_turfs = return_ordered_turfs(x, y, z, dir)
-
- var/area/underlying_area = GLOB.areas_by_type[underlying_area_type]
- if(!underlying_area)
- underlying_area = new underlying_area_type(null)
-
- for(var/i in 1 to old_turfs.len)
- var/turf/oldT = old_turfs[i]
- if(!oldT || !istype(oldT.loc, area_type))
- continue
- oldT.change_area(oldT.loc, underlying_area)
- oldT.empty(FALSE)
-
- // Here we locate the bottommost shuttle boundary and remove all turfs above it
- var/shuttle_tile_depth = oldT.depth_to_find_baseturf(/turf/baseturf_skipover/shuttle)
- if (!isnull(shuttle_tile_depth))
- oldT.ScrapeAway(shuttle_tile_depth)
-
- qdel(src, force=TRUE)
-
-/**
- * Ghosts and marks as escaped (for greentext purposes) all mobs, then deletes the shuttle.
- * Used by the Shuttle Manipulator
- */
-/obj/docking_port/mobile/proc/intoTheSunset()
- // Loop over mobs
- for(var/turf/turfs as anything in return_turfs())
- for(var/mob/living/sunset_mobs in turfs.get_all_contents())
- // If they have a mind and they're not in the brig, they escaped
- if(sunset_mobs.mind && !istype(get_area(sunset_mobs), /area/shuttle/escape/brig))
- sunset_mobs.mind.force_escaped = TRUE
- // Ghostize them and put them in nullspace stasis (for stat & possession checks)
- ADD_TRAIT(sunset_mobs, TRAIT_NO_TRANSFORM, REF(src))
- sunset_mobs.ghostize(FALSE)
- sunset_mobs.moveToNullspace()
-
- // Now that mobs are stowed, delete the shuttle
- jumpToNullSpace()
-
-/obj/docking_port/mobile/proc/create_ripples(obj/docking_port/stationary/S1, animate_time)
- var/list/turfs = ripple_area(S1)
- for(var/t in turfs)
- ripples += new /obj/effect/abstract/ripple(t, animate_time)
-
-/obj/docking_port/mobile/proc/remove_ripples()
- QDEL_LIST(ripples)
-
-/obj/docking_port/mobile/proc/ripple_area(obj/docking_port/stationary/S1)
- var/list/L0 = return_ordered_turfs(x, y, z, dir)
- var/list/L1 = return_ordered_turfs(S1.x, S1.y, S1.z, S1.dir)
-
- var/list/ripple_turfs = list()
- var/stop = min(L0.len, L1.len)
- for(var/i in 1 to stop)
- var/turf/T0 = L0[i]
- var/turf/T1 = L1[i]
- if(!istype(T0.loc, area_type) || istype(T0.loc, /area/shuttle/transit))
- continue // not part of the shuttle
- ripple_turfs += T1
-
- return ripple_turfs
-
-/obj/docking_port/mobile/proc/check_poddoors()
- for(var/obj/machinery/door/poddoor/shuttledock/pod as anything in SSmachines.get_machines_by_type_and_subtypes(/obj/machinery/door/poddoor/shuttledock))
- pod.check()
-
-/obj/docking_port/mobile/proc/dock_id(id)
- var/port = SSshuttle.getDock(id)
- if(port)
- . = initiate_docking(port)
- else
- . = null
-
-//used by shuttle subsystem to check timers
-/obj/docking_port/mobile/proc/check()
- check_effects()
- //process_events() if you were to add events to non-escape shuttles, uncomment this
-
- if(mode == SHUTTLE_IGNITING)
- check_transit_zone()
-
- if(timeLeft(1) > 0)
- return
- // If we can't dock or we don't have a transit slot, wait for 20 ds,
- // then try again
- switch(mode)
- if(SHUTTLE_CALL, SHUTTLE_PREARRIVAL)
- if(prearrivalTime && mode != SHUTTLE_PREARRIVAL)
- mode = SHUTTLE_PREARRIVAL
- setTimer(prearrivalTime)
- return
- var/error = initiate_docking(destination, preferred_direction)
- if(error && error & (DOCKING_NULL_DESTINATION | DOCKING_NULL_SOURCE))
- var/msg = "A mobile dock in transit exited initiate_docking() with an error. This is most likely a mapping problem: Error: [error], ([src]) ([previous][ADMIN_JMP(previous)] -> [destination][ADMIN_JMP(destination)])"
- WARNING(msg)
- message_admins(msg)
- mode = SHUTTLE_IDLE
- return
- else if(error)
- setTimer(20)
- return
- if(rechargeTime)
- mode = SHUTTLE_RECHARGING
- setTimer(rechargeTime)
- return
- if(SHUTTLE_RECALL)
- if(initiate_docking(previous) != DOCKING_SUCCESS)
- setTimer(20)
- return
- if(SHUTTLE_IGNITING)
- if(check_transit_zone() != TRANSIT_READY)
- setTimer(20)
- return
- else
- mode = SHUTTLE_CALL
- setTimer(callTime * engine_coeff)
- enterTransit()
- return
-
- mode = SHUTTLE_IDLE
- timer = 0
- destination = null
-
-/obj/docking_port/mobile/proc/check_effects()
- if(!ripples.len)
- if((mode == SHUTTLE_CALL) || (mode == SHUTTLE_RECALL))
- var/tl = timeLeft(1)
- if(tl <= SHUTTLE_RIPPLE_TIME)
- create_ripples(destination, tl)
-
- var/obj/docking_port/stationary/S0 = get_docked()
- if(istype(S0, /obj/docking_port/stationary/transit) && timeLeft(1) <= PARALLAX_LOOP_TIME)
- for(var/place in shuttle_areas)
- var/area/shuttle/shuttle_area = place
- if(shuttle_area.parallax_movedir)
- parallax_slowdown()
-
-/obj/docking_port/mobile/proc/parallax_slowdown()
- for(var/place in shuttle_areas)
- var/area/shuttle/shuttle_area = place
- shuttle_area.parallax_movedir = FALSE
- if(assigned_transit?.assigned_area)
- assigned_transit.assigned_area.parallax_movedir = FALSE
- var/list/L0 = return_ordered_turfs(x, y, z, dir)
- for (var/thing in L0)
- var/turf/T = thing
- if(!T || !istype(T.loc, area_type))
- continue
- for (var/atom/movable/movable as anything in T)
- if (movable.client_mobs_in_contents)
- movable.update_parallax_contents()
-
-/obj/docking_port/mobile/proc/check_transit_zone()
- if(assigned_transit)
- return TRANSIT_READY
- else
- SSshuttle.request_transit_dock(src)
-
-/obj/docking_port/mobile/proc/setTimer(wait)
- timer = world.time + wait
- last_timer_length = wait
-
-/obj/docking_port/mobile/proc/modTimer(multiple)
- var/time_remaining = timer - world.time
- if(time_remaining < 0 || !last_timer_length)
- return
- time_remaining *= multiple
- last_timer_length *= multiple
- setTimer(time_remaining)
-
-/obj/docking_port/mobile/proc/alert_coeff_change(new_coeff)
- if(isnull(new_coeff))
- return
-
- var/time_multiplier = new_coeff / alert_coeff
- var/time_remaining = timer - world.time
- if(time_remaining < 0 || !last_timer_length)
- return
-
- time_remaining *= time_multiplier
- last_timer_length *= time_multiplier
- alert_coeff = new_coeff
- setTimer(time_remaining)
-
-/obj/docking_port/mobile/proc/invertTimer()
- if(!last_timer_length)
- return
- var/time_remaining = timer - world.time
- if(time_remaining > 0)
- var/time_passed = last_timer_length - time_remaining
- setTimer(time_passed)
-
-//returns timeLeft
-/obj/docking_port/mobile/proc/timeLeft(divisor)
- if(divisor <= 0)
- divisor = 10
-
- var/ds_remaining
- if(!timer)
- ds_remaining = callTime * engine_coeff
- else
- ds_remaining = max(0, timer - world.time)
-
- . = round(ds_remaining / divisor, 1)
-
-// returns 3-letter mode string, used by status screens and mob status panel
-/obj/docking_port/mobile/proc/getModeStr()
- switch(mode)
- if(SHUTTLE_IGNITING)
- return "IGN"
- if(SHUTTLE_RECALL)
- return "RCL"
- if(SHUTTLE_CALL)
- return "ETA"
- if(SHUTTLE_DOCKED)
- return "ETD"
- if(SHUTTLE_ESCAPE)
- return "ESC"
- if(SHUTTLE_STRANDED)
- return "ERR"
- if(SHUTTLE_RECHARGING)
- return "RCH"
- if(SHUTTLE_PREARRIVAL)
- return "LDN"
- if(SHUTTLE_DISABLED)
- return "DIS"
- return ""
-
-// returns 5-letter timer string, used by status screens and mob status panel
-/obj/docking_port/mobile/proc/getTimerStr()
- if(mode == SHUTTLE_STRANDED || mode == SHUTTLE_DISABLED)
- return "--:--"
-
- var/timeleft = timeLeft()
- if(timeleft > 1 HOURS)
- return "--:--"
- else if(timeleft > 0)
- return "[add_leading(num2text((timeleft / 60) % 60), 2, "0")]:[add_leading(num2text(timeleft % 60), 2, "0")]"
- else
- return "00:00"
-
-/**
- * Gets shuttle location status in a form of string for tgui interfaces
- */
-/obj/docking_port/mobile/proc/get_status_text_tgui()
- var/obj/docking_port/stationary/dockedAt = get_docked()
- var/docked_at = dockedAt?.name || "Unknown"
- if(!istype(dockedAt, /obj/docking_port/stationary/transit))
- return docked_at
- if(timeLeft() > 1 HOURS)
- return "Hyperspace"
- else
- var/obj/docking_port/stationary/dst = (mode == SHUTTLE_RECALL) ? previous : destination
- return "In transit to [dst?.name || "unknown location"]"
-
-/obj/docking_port/mobile/proc/getStatusText()
- var/obj/docking_port/stationary/dockedAt = get_docked()
- var/docked_at = dockedAt?.name || "unknown"
- if(istype(dockedAt, /obj/docking_port/stationary/transit))
- if (timeLeft() > 1 HOURS)
- return "hyperspace"
- else
- var/obj/docking_port/stationary/dst
- if(mode == SHUTTLE_RECALL)
- dst = previous
- else
- dst = destination
- . = "transit towards [dst?.name || "unknown location"] ([getTimerStr()])"
- else if(mode == SHUTTLE_RECHARGING)
- return "[docked_at], recharging [getTimerStr()]"
- else
- return docked_at
-
-/obj/docking_port/mobile/proc/getDbgStatusText()
- var/obj/docking_port/stationary/dockedAt = get_docked()
- . = (dockedAt?.name) ? dockedAt.name : "unknown"
- if(istype(dockedAt, /obj/docking_port/stationary/transit))
- var/obj/docking_port/stationary/dst
- if(mode == SHUTTLE_RECALL)
- dst = previous
- else
- dst = destination
- if(dst)
- . = "(transit to) [dst.name || dst.shuttle_id]"
- else
- . = "(transit to) nowhere"
- else if(dockedAt)
- . = dockedAt.name || dockedAt.shuttle_id
- else
- . = "unknown"
-
-
-// attempts to locate /obj/machinery/computer/shuttle with matching ID inside the shuttle
-/obj/docking_port/mobile/proc/get_control_console()
- for(var/area/shuttle/shuttle_area as anything in shuttle_areas)
- var/obj/machinery/computer/shuttle/shuttle_computer = locate(/obj/machinery/computer/shuttle) in shuttle_area
- if(!shuttle_computer)
- continue
- if(shuttle_computer.shuttleId == shuttle_id)
- return shuttle_computer
- return null
-
-/obj/docking_port/mobile/proc/hyperspace_sound(phase, list/areas)
- var/selected_sound
- switch(phase)
- if(HYPERSPACE_WARMUP)
- selected_sound = "hyperspace_begin"
- if(HYPERSPACE_LAUNCH)
- selected_sound = "hyperspace_progress"
- if(HYPERSPACE_END)
- selected_sound = "hyperspace_end"
- else
- CRASH("Invalid hyperspace sound phase: [phase]")
- // This previously was played from each door at max volume, and was one of the worst things I had ever seen.
- // Now it's instead played from the nearest engine if close, or the first engine in the list if far since it doesn't really matter.
- // Or a door if for some reason the shuttle has no engine, fuck oh hi daniel fuck it
- var/range = (engine_coeff * max(width, height))
- var/long_range = range * 2.5
- var/atom/distant_source
-
- if(engine_list.len)
- distant_source = engine_list[1]
- else
- for(var/our_area in areas)
- distant_source = locate(/obj/machinery/door) in our_area
- if(distant_source)
- break
-
- if(!distant_source)
- return
- for(var/mob/zlevel_mobs as anything in SSmobs.clients_by_zlevel[z])
- var/dist_far = get_dist(zlevel_mobs, distant_source)
- if(dist_far <= long_range && dist_far > range)
- zlevel_mobs.playsound_local(distant_source, "sound/runtime/hyperspace/[selected_sound]_distance.ogg", 100)
- else if(dist_far <= range)
- var/source
- if(!engine_list.len)
- source = distant_source
- else
- var/closest_dist = 10000
- for(var/obj/machinery/power/shuttle_engine/engines as anything in engine_list)
- var/dist_near = get_dist(zlevel_mobs, engines)
- if(dist_near < closest_dist)
- source = engines
- closest_dist = dist_near
- zlevel_mobs.playsound_local(source, "sound/runtime/hyperspace/[selected_sound].ogg", 100)
-
-// Losing all initial engines should get you 2
-// Adding another set of engines at 0.5 time
-/obj/docking_port/mobile/proc/alter_engines(mod)
- if(!mod)
- return
- var/old_coeff = engine_coeff
- engine_coeff = get_engine_coeff(mod)
- current_engine_power = max(0, current_engine_power + mod)
- if(in_flight())
- var/delta_coeff = engine_coeff / old_coeff
- modTimer(delta_coeff)
-
-// Double initial engines to get to 0.5 minimum
-// Lose all initial engines to get to 2
-//For 0 engine shuttles like BYOS 5 engines to get to doublespeed
-/obj/docking_port/mobile/proc/get_engine_coeff(engine_mod)
- var/new_value = max(0, current_engine_power + engine_mod)
- if(new_value == initial_engine_power)
- return 1
- if(new_value > initial_engine_power)
- var/delta = new_value - initial_engine_power
- var/change_per_engine = (1 - ENGINE_COEFF_MIN) / ENGINE_DEFAULT_MAXSPEED_ENGINES // 5 by default
- if(initial_engine_power > 0)
- change_per_engine = (1 - ENGINE_COEFF_MIN) / initial_engine_power // or however many it had
- return clamp(1 - delta * change_per_engine,ENGINE_COEFF_MIN, ENGINE_COEFF_MAX)
- if(new_value < initial_engine_power)
- var/delta = initial_engine_power - new_value
- var/change_per_engine = 1 //doesn't really matter should not be happening for 0 engine shuttles
- if(initial_engine_power > 0)
- change_per_engine = (ENGINE_COEFF_MAX - 1) / initial_engine_power //just linear drop to max delay
- return clamp(1 + delta * change_per_engine, ENGINE_COEFF_MIN, ENGINE_COEFF_MAX)
-
-
-/obj/docking_port/mobile/proc/in_flight()
- switch(mode)
- if(SHUTTLE_CALL,SHUTTLE_RECALL,SHUTTLE_PREARRIVAL)
- return TRUE
- if(SHUTTLE_IDLE,SHUTTLE_IGNITING)
- return FALSE
- return FALSE // hmm
-
-/obj/docking_port/mobile/emergency/in_flight()
- switch(mode)
- if(SHUTTLE_ESCAPE)
- return TRUE
- if(SHUTTLE_STRANDED,SHUTTLE_ENDGAME)
- return FALSE
- return ..()
-
-//Called when emergency shuttle leaves the station
-/obj/docking_port/mobile/proc/on_emergency_launch()
- if(launch_status == UNLAUNCHED) //Pods will not launch from the mine/planet, and other ships won't launch unless we tell them to.
- launch_status = ENDGAME_LAUNCHED
- enterTransit()
-
-///Let people know shits about to go down
-/obj/docking_port/mobile/proc/announce_shuttle_events()
- for(var/datum/shuttle_event/event as anything in event_list)
- notify_ghosts("The [name] has selected: [event.name]")
-
-/obj/docking_port/mobile/emergency/on_emergency_launch()
- return
-
-//Called when emergency shuttle docks at centcom
-/obj/docking_port/mobile/proc/on_emergency_dock()
- // Mapping a new docking point for each ship mappers could potentially want docking with centcom would take up lots of space,
- // just let them keep flying off "into the sunset" for their greentext.
- if(launch_status == ENDGAME_LAUNCHED)
- launch_status = ENDGAME_TRANSIT
-
-/obj/docking_port/mobile/pod/on_emergency_dock()
- if(launch_status == ENDGAME_LAUNCHED)
- initiate_docking(SSshuttle.getDock("[shuttle_id]_away")) //Escape pods dock at centcom
- mode = SHUTTLE_ENDGAME
-
-/obj/docking_port/mobile/emergency/on_emergency_dock()
- return
-
-///Process all the shuttle events for every shuttle tick we get
-/obj/docking_port/mobile/proc/process_events()
- var/list/removees
- for(var/datum/shuttle_event/event as anything in event_list)
- if(event.event_process() == SHUTTLE_EVENT_CLEAR) //if we return SHUTTLE_EVENT_CLEAR, we clean them up
- LAZYADD(removees, event)
- for(var/item in removees)
- event_list.Remove(item)
-
-/// Give a typepath of a shuttle event to add to the shuttle. If added during endgame transit, will insta start the event
-/obj/docking_port/mobile/proc/add_shuttle_event(typepath)
- var/datum/shuttle_event/event = new typepath (src)
- event_list.Add(event)
- if(launch_status == ENDGAME_LAUNCHED)
- event.start_up_event(0)
- return event
-
-#ifdef TESTING
-#undef DOCKING_PORT_HIGHLIGHT
-#endif
diff --git a/code/modules/shuttle/monastery.dm b/code/modules/shuttle/shuttle_consoles/monastery.dm
similarity index 100%
rename from code/modules/shuttle/monastery.dm
rename to code/modules/shuttle/shuttle_consoles/monastery.dm
diff --git a/code/modules/shuttle/navigation_computer.dm b/code/modules/shuttle/shuttle_consoles/navigation_computer.dm
similarity index 100%
rename from code/modules/shuttle/navigation_computer.dm
rename to code/modules/shuttle/shuttle_consoles/navigation_computer.dm
diff --git a/code/modules/shuttle/computer.dm b/code/modules/shuttle/shuttle_consoles/shuttle_console.dm
similarity index 100%
rename from code/modules/shuttle/computer.dm
rename to code/modules/shuttle/shuttle_consoles/shuttle_console.dm
diff --git a/code/modules/shuttle/syndicate.dm b/code/modules/shuttle/shuttle_consoles/syndicate.dm
similarity index 100%
rename from code/modules/shuttle/syndicate.dm
rename to code/modules/shuttle/shuttle_consoles/syndicate.dm
diff --git a/code/modules/shuttle/white_ship.dm b/code/modules/shuttle/shuttle_consoles/white_ship.dm
similarity index 100%
rename from code/modules/shuttle/white_ship.dm
rename to code/modules/shuttle/shuttle_consoles/white_ship.dm
diff --git a/code/modules/shuttle/stationary_port/port_types.dm b/code/modules/shuttle/stationary_port/port_types.dm
new file mode 100644
index 0000000000000..047856566c2db
--- /dev/null
+++ b/code/modules/shuttle/stationary_port/port_types.dm
@@ -0,0 +1,100 @@
+/// Subtype for escape pod ports so that we can give them trait behaviour
+/obj/docking_port/stationary/escape_pod
+ name = "escape pod loader"
+ height = 5
+ width = 3
+ dwidth = 1
+ roundstart_template = /datum/map_template/shuttle/escape_pod/default
+ /// Set to true if you have a snowflake escape pod dock which needs to always have the normal pod or some other one
+ var/enforce_specific_pod = FALSE
+
+/obj/docking_port/stationary/escape_pod/Initialize(mapload)
+ . = ..()
+ if (enforce_specific_pod)
+ return
+
+ if (HAS_TRAIT(SSstation, STATION_TRAIT_SMALLER_PODS))
+ roundstart_template = /datum/map_template/shuttle/escape_pod/cramped
+ return
+ if (HAS_TRAIT(SSstation, STATION_TRAIT_BIGGER_PODS))
+ roundstart_template = /datum/map_template/shuttle/escape_pod/luxury
+
+// should fit the syndicate infiltrator, and smaller ships like the battlecruiser corvettes and fighters
+/obj/docking_port/stationary/syndicate
+ name = "near the station"
+ dheight = 1
+ dwidth = 12
+ height = 17
+ width = 23
+ shuttle_id = "syndicate_nearby"
+
+/obj/docking_port/stationary/syndicate/northwest
+ name = "northwest of station"
+ shuttle_id = "syndicate_nw"
+
+/obj/docking_port/stationary/syndicate/northeast
+ name = "northeast of station"
+ shuttle_id = "syndicate_ne"
+
+/obj/docking_port/stationary/transit
+ name = "In Transit"
+ override_can_dock_checks = TRUE
+ /// The turf reservation returned by the transit area request
+ var/datum/turf_reservation/reserved_area
+ /// The area created during the transit area reservation
+ var/area/shuttle/transit/assigned_area
+ /// The mobile port that owns this transit port
+ var/obj/docking_port/mobile/owner
+
+/obj/docking_port/stationary/transit/Initialize(mapload)
+ . = ..()
+ SSshuttle.transit_docking_ports += src
+
+/obj/docking_port/stationary/transit/Destroy(force=FALSE)
+ if(force)
+ if(get_docked())
+ log_world("A transit dock was destroyed while something was docked to it.")
+ SSshuttle.transit_docking_ports -= src
+ if(owner)
+ if(owner.assigned_transit == src)
+ owner.assigned_transit = null
+ owner = null
+ if(!QDELETED(reserved_area))
+ qdel(reserved_area)
+ reserved_area = null
+ return ..()
+
+/obj/docking_port/stationary/picked
+ ///Holds a list of map name strings for the port to pick from
+ var/list/shuttlekeys
+
+/obj/docking_port/stationary/picked/Initialize(mapload)
+ . = ..()
+ if(!LAZYLEN(shuttlekeys))
+ WARNING("Random docking port [shuttle_id] loaded with no shuttle keys")
+ return
+ var/selectedid = pick(shuttlekeys)
+ roundstart_template = SSmapping.shuttle_templates[selectedid]
+
+/obj/docking_port/stationary/picked/whiteship
+ name = "Deep Space"
+ shuttle_id = "whiteship_away"
+ height = 45 //Width and height need to remain in sync with the size of whiteshipdock.dmm, otherwise we'll get overflow
+ width = 44
+ dheight = 18
+ dwidth = 18
+ dir = 2
+ shuttlekeys = list(
+ "whiteship_meta",
+ "whiteship_pubby",
+ "whiteship_box",
+ "whiteship_cere",
+ "whiteship_kilo",
+ "whiteship_donut",
+ "whiteship_delta",
+ "whiteship_tram",
+ "whiteship_personalshuttle",
+ "whiteship_obelisk",
+ "whiteship_birdshot",
+ )
+
diff --git a/code/modules/shuttle/stationary_port/stationary_port.dm b/code/modules/shuttle/stationary_port/stationary_port.dm
new file mode 100644
index 0000000000000..49437730cb071
--- /dev/null
+++ b/code/modules/shuttle/stationary_port/stationary_port.dm
@@ -0,0 +1,91 @@
+
+/obj/docking_port/stationary
+ name = "dock"
+
+ var/last_dock_time
+
+ /// Map template to load when the dock is loaded
+ var/datum/map_template/shuttle/roundstart_template
+ /// Used to check if the shuttle template is enabled in the config file
+ var/json_key
+ ///If true, the shuttle can always dock at this docking port, despite its area checks, or if something is already docked
+ var/override_can_dock_checks = FALSE
+
+/obj/docking_port/stationary/Initialize(mapload)
+ . = ..()
+ register()
+ if(!area_type)
+ var/area/place = get_area(src)
+ area_type = place?.type // We might be created in nullspace
+
+ if(mapload)
+ for(var/turf/T in return_turfs())
+ T.turf_flags |= NO_RUINS
+
+ if(SSshuttle.initialized)
+ INVOKE_ASYNC(SSshuttle, TYPE_PROC_REF(/datum/controller/subsystem/shuttle, setup_shuttles), list(src))
+
+#ifdef TESTING
+ highlight("#f00")
+#endif
+
+/obj/docking_port/stationary/Destroy(force)
+ if(force)
+ unregister()
+ return ..()
+
+/obj/docking_port/stationary/register(replace = FALSE)
+ . = ..()
+ if(!shuttle_id)
+ shuttle_id = "dock"
+ else
+ port_destinations = shuttle_id
+
+ if(!name)
+ name = "dock"
+
+ var/counter = SSshuttle.assoc_stationary[shuttle_id]
+ if(!replace || !counter)
+ if(counter)
+ counter++
+ SSshuttle.assoc_stationary[shuttle_id] = counter
+ shuttle_id = "[shuttle_id]_[counter]"
+ name = "[name] [counter]"
+ else
+ SSshuttle.assoc_stationary[shuttle_id] = 1
+
+ if(!port_destinations)
+ port_destinations = shuttle_id
+
+ SSshuttle.stationary_docking_ports += src
+
+/obj/docking_port/stationary/unregister()
+ . = ..()
+ SSshuttle.stationary_docking_ports -= src
+
+/obj/docking_port/stationary/Moved(atom/old_loc, movement_dir, forced, list/old_locs, momentum_change = TRUE)
+ . = ..()
+ if(area_type) // We already have one
+ return
+ var/area/newarea = get_area(src)
+ area_type = newarea?.type
+
+/obj/docking_port/stationary/proc/load_roundstart()
+ if(json_key)
+ var/sid = SSmapping.current_map.shuttles[json_key]
+ roundstart_template = SSmapping.shuttle_templates[sid]
+ if(!roundstart_template)
+ CRASH("json_key:[json_key] value \[[sid]\] resulted in a null shuttle template for [src]")
+ else if(roundstart_template) // passed a PATH
+ var/sid = "[initial(roundstart_template.port_id)]_[initial(roundstart_template.suffix)]"
+
+ roundstart_template = SSmapping.shuttle_templates[sid]
+ if(!roundstart_template)
+ CRASH("Invalid path ([sid]/[roundstart_template]) passed to docking port.")
+
+ if(roundstart_template)
+ SSshuttle.action_load(roundstart_template, src)
+
+//returns first-found touching shuttleport
+/obj/docking_port/stationary/get_docked()
+ . = locate(/obj/docking_port/mobile) in loc
diff --git a/code/modules/station_goals/meteor_shield.dm b/code/modules/station_goals/meteor_shield.dm
index 84a61395a4b9c..e4b76f600ca80 100644
--- a/code/modules/station_goals/meteor_shield.dm
+++ b/code/modules/station_goals/meteor_shield.dm
@@ -61,13 +61,14 @@
name = "\improper Meteor Shield Satellite"
desc = "A meteor point-defense satellite."
mode = "M-SHIELD"
- processing_flags = START_PROCESSING_MANUALLY
- subsystem_type = /datum/controller/subsystem/processing/fastprocess
/// the range a meteor shield sat can destroy meteors
var/kill_range = 14
//emag behavior dark matt-eor stuff
+ /// Proximity monitor associated with this atom, needed for it to work.
+ var/datum/proximity_monitor/proximity_monitor
+
/// amount of emagged active meteor shields
var/static/emagged_active_meteor_shields = 0
/// the highest amount of shields you've ever emagged
@@ -94,34 +95,43 @@
return FALSE
return TRUE
-/obj/machinery/satellite/meteor_shield/process()
- if(obj_flags & EMAGGED)
- //kills the processing because emagged meteor shields no longer stop meteors in any way
- return PROCESS_KILL
- if(!active)
+/obj/machinery/satellite/meteor_shield/Initialize(mapload)
+ . = ..()
+ proximity_monitor = new(src, /* range = */ 0)
+
+/obj/machinery/satellite/meteor_shield/HasProximity(atom/movable/proximity_check_mob)
+ . = ..()
+ if(!istype(proximity_check_mob, /obj/effect/meteor))
return
- for(var/obj/effect/meteor/meteor_to_destroy in GLOB.meteor_list)
- if(meteor_to_destroy.z != z)
- continue
- if(get_dist(meteor_to_destroy, src) > kill_range)
- continue
- if(space_los(meteor_to_destroy))
- var/turf/beam_from = get_turf(src)
- beam_from.Beam(get_turf(meteor_to_destroy), icon_state="sat_beam", time = 5)
- if(meteor_to_destroy.shield_defense(src))
- qdel(meteor_to_destroy)
+ var/obj/effect/meteor/meteor_to_destroy = proximity_check_mob
+ if(space_los(meteor_to_destroy))
+ var/turf/beam_from = get_turf(src)
+ beam_from.Beam(get_turf(meteor_to_destroy), icon_state="sat_beam", time = 5)
+ if(meteor_to_destroy.shield_defense(src))
+ qdel(meteor_to_destroy)
/obj/machinery/satellite/meteor_shield/toggle(user)
+ if(user)
+ balloon_alert(user, "looking for [active ? "off" : "on"] button")
+ if(user && !do_after(user, 2 SECONDS, src, IGNORE_HELD_ITEM))
+ return FALSE
if(!..(user))
return FALSE
if(obj_flags & EMAGGED)
update_emagged_meteor_sat(user)
+ if(active)
+ proximity_monitor.set_range(kill_range)
+ else
+ proximity_monitor.set_range(0)
+
+
var/datum/station_goal/station_shield/goal = SSstation.get_station_goal(/datum/station_goal/station_shield)
goal?.update_coverage()
/obj/machinery/satellite/meteor_shield/Destroy()
. = ..()
+ QDEL_NULL(proximity_monitor)
if(obj_flags & EMAGGED)
//satellites that are destroying are not active, this will count down the number of emagged sats
update_emagged_meteor_sat()
@@ -181,6 +191,7 @@
for(var/datum/round_event_control/stray_meteor/stray_meteor in SSevents.control)
stray_meteor.weight *= mod
+
#undef EMAGGED_METEOR_SHIELD_THRESHOLD_ONE
#undef EMAGGED_METEOR_SHIELD_THRESHOLD_TWO
#undef EMAGGED_METEOR_SHIELD_THRESHOLD_THREE
diff --git a/code/modules/surgery/bodyparts/_bodyparts.dm b/code/modules/surgery/bodyparts/_bodyparts.dm
index 64750e21c9b6d..d6e6e101c6e39 100644
--- a/code/modules/surgery/bodyparts/_bodyparts.dm
+++ b/code/modules/surgery/bodyparts/_bodyparts.dm
@@ -1271,14 +1271,11 @@
* * gauze- Just the gauze stack we're taking a sheet from to apply here
*/
/obj/item/bodypart/proc/apply_gauze(obj/item/stack/medical/gauze/new_gauze)
- if(!istype(new_gauze) || !new_gauze.absorption_capacity)
+ if(!istype(new_gauze) || !new_gauze.absorption_capacity || !new_gauze.use(1))
return
- var/newly_gauzed = FALSE
- if(!current_gauze)
- newly_gauzed = TRUE
+ var/newly_gauzed = !current_gauze
QDEL_NULL(current_gauze)
current_gauze = new new_gauze.type(src, 1)
- new_gauze.use(1)
current_gauze.gauzed_bodypart = src
if(newly_gauzed)
SEND_SIGNAL(src, COMSIG_BODYPART_GAUZED, current_gauze, new_gauze)
diff --git a/code/modules/surgery/organs/external/wings/functional_wings.dm b/code/modules/surgery/organs/external/wings/functional_wings.dm
index 775894458349a..0d445cb031428 100644
--- a/code/modules/surgery/organs/external/wings/functional_wings.dm
+++ b/code/modules/surgery/organs/external/wings/functional_wings.dm
@@ -11,7 +11,7 @@
/datum/action/innate/flight/Activate()
var/mob/living/carbon/human/human = owner
var/obj/item/organ/wings/functional/wings = human.get_organ_slot(ORGAN_SLOT_EXTERNAL_WINGS)
- if(wings?.can_fly(human))
+ if(wings?.can_fly())
wings.toggle_flight(human)
///The true wings that you can use to fly and shit (you cant actually shit with them)
@@ -29,6 +29,23 @@
// grind_results = list(/datum/reagent/flightpotion = 5)
food_reagents = list(/datum/reagent/flightpotion = 5)
+ var/drift_force = FUNCTIONAL_WING_FORCE
+ var/stabilizer_force = FUNCTIONAL_WING_STABILIZATION
+
+/obj/item/organ/wings/functional/Initialize(mapload)
+ . = ..()
+ AddComponent( \
+ /datum/component/jetpack, \
+ TRUE, \
+ drift_force, \
+ stabilizer_force, \
+ COMSIG_WINGS_OPENED, \
+ COMSIG_WINGS_CLOSED, \
+ null, \
+ CALLBACK(src, PROC_REF(can_fly)), \
+ CALLBACK(src, PROC_REF(can_fly)), \
+ )
+
/obj/item/organ/wings/functional/Destroy()
QDEL_NULL(fly)
return ..()
@@ -54,14 +71,14 @@
/obj/item/organ/wings/functional/proc/handle_flight(mob/living/carbon/human/human)
if(!HAS_TRAIT_FROM(human, TRAIT_MOVE_FLOATING, SPECIES_FLIGHT_TRAIT))
return FALSE
- if(!can_fly(human))
+ if(!can_fly())
toggle_flight(human)
return FALSE
return TRUE
-
///Check if we're still eligible for flight (wings covered, atmosphere too thin, etc)
-/obj/item/organ/wings/functional/proc/can_fly(mob/living/carbon/human/human)
+/obj/item/organ/wings/functional/proc/can_fly()
+ var/mob/living/carbon/human/human = owner
if(human.stat || human.body_position == LYING_DOWN || isnull(human.client))
return FALSE
//Jumpsuits have tail holes, so it makes sense they have wing holes too
@@ -105,13 +122,10 @@
/obj/item/organ/wings/functional/proc/toggle_flight(mob/living/carbon/human/human)
if(!HAS_TRAIT_FROM(human, TRAIT_MOVE_FLOATING, SPECIES_FLIGHT_TRAIT))
human.physiology.stun_mod *= 2
- human.add_traits(list(TRAIT_NO_FLOATING_ANIM, TRAIT_MOVE_FLOATING, TRAIT_IGNORING_GRAVITY, TRAIT_NOGRAV_ALWAYS_DRIFT), SPECIES_FLIGHT_TRAIT)
+ human.add_traits(list(TRAIT_MOVE_FLOATING, TRAIT_IGNORING_GRAVITY, TRAIT_NOGRAV_ALWAYS_DRIFT), SPECIES_FLIGHT_TRAIT)
human.add_movespeed_modifier(/datum/movespeed_modifier/jetpack/wings)
human.AddElement(/datum/element/forced_gravity, 0)
passtable_on(human, SPECIES_FLIGHT_TRAIT)
- RegisterSignal(human, COMSIG_MOB_CLIENT_MOVE_NOGRAV, PROC_REF(on_client_move))
- RegisterSignal(human, COMSIG_MOB_ATTEMPT_HALT_SPACEMOVE, PROC_REF(on_pushoff))
- START_PROCESSING(SSnewtonian_movement, src)
open_wings()
to_chat(human, span_notice("You beat your wings and begin to hover gently above the ground..."))
human.set_resting(FALSE, TRUE)
@@ -119,50 +133,21 @@
return
human.physiology.stun_mod *= 0.5
- human.remove_traits(list(TRAIT_NO_FLOATING_ANIM, TRAIT_MOVE_FLOATING, TRAIT_IGNORING_GRAVITY, TRAIT_NOGRAV_ALWAYS_DRIFT), SPECIES_FLIGHT_TRAIT)
+ human.remove_traits(list(TRAIT_MOVE_FLOATING, TRAIT_IGNORING_GRAVITY, TRAIT_NOGRAV_ALWAYS_DRIFT), SPECIES_FLIGHT_TRAIT)
human.remove_movespeed_modifier(/datum/movespeed_modifier/jetpack/wings)
human.RemoveElement(/datum/element/forced_gravity, 0)
passtable_off(human, SPECIES_FLIGHT_TRAIT)
- UnregisterSignal(human, list(COMSIG_MOB_CLIENT_MOVE_NOGRAV, COMSIG_MOB_ATTEMPT_HALT_SPACEMOVE))
- STOP_PROCESSING(SSnewtonian_movement, src)
to_chat(human, span_notice("You settle gently back onto the ground..."))
close_wings()
human.refresh_gravity()
-/obj/item/organ/wings/functional/proc/on_client_move(mob/source, list/move_args)
- SIGNAL_HANDLER
-
- if (!can_fly(source))
- return
-
- var/max_drift_force = (DEFAULT_INERTIA_SPEED / source.cached_multiplicative_slowdown - 1) / INERTIA_SPEED_COEF + 1
- source.newtonian_move(dir2angle(source.client.intended_direction), instant = TRUE, drift_force = FUNCTIONAL_WING_FORCE, controlled_cap = max_drift_force)
- source.setDir(source.client.intended_direction)
-
-/obj/item/organ/wings/functional/proc/on_pushoff(mob/source, movement_dir, continuous_move, atom/backup)
- SIGNAL_HANDLER
-
- if (get_dir(source, backup) == movement_dir || source.loc == backup.loc)
- return
-
- if (!can_fly(source) || !source.client.intended_direction || (source.client.intended_direction & get_dir(source, backup)))
- return
-
- return COMPONENT_PREVENT_SPACEMOVE_HALT
-
-/obj/item/organ/wings/functional/process(seconds_per_tick)
- if (!owner || !can_fly(owner) || isnull(owner.drift_handler))
- return
-
- var/max_drift_force = (DEFAULT_INERTIA_SPEED / owner.cached_multiplicative_slowdown - 1) / INERTIA_SPEED_COEF + 1
- owner.drift_handler.stabilize_drift(owner.client.intended_direction ? dir2angle(owner.client.intended_direction) : null, owner.client.intended_direction ? max_drift_force : 0, FUNCTIONAL_WING_STABILIZATION * (seconds_per_tick * 1 SECONDS))
-
///SPREAD OUR WINGS AND FLLLLLYYYYYY
/obj/item/organ/wings/functional/proc/open_wings()
var/datum/bodypart_overlay/mutant/wings/functional/overlay = bodypart_overlay
overlay.open_wings()
wings_open = TRUE
owner.update_body_parts()
+ SEND_SIGNAL(src, COMSIG_WINGS_OPENED, owner)
///close our wings
/obj/item/organ/wings/functional/proc/close_wings()
@@ -175,6 +160,8 @@
var/turf/location = loc
location.Entered(src, NONE)
+ SEND_SIGNAL(src, COMSIG_WINGS_CLOSED, owner)
+
///Bodypart overlay of function wings, including open and close functionality!
/datum/bodypart_overlay/mutant/wings/functional
///Are our wings currently open? Change through open_wings or close_wings()
diff --git a/code/modules/surgery/organs/external/wings/moth_wings.dm b/code/modules/surgery/organs/external/wings/moth_wings.dm
index 265a9ee751226..da35ea25d50e8 100644
--- a/code/modules/surgery/organs/external/wings/moth_wings.dm
+++ b/code/modules/surgery/organs/external/wings/moth_wings.dm
@@ -16,18 +16,31 @@
///Store our old datum here for if our burned wings are healed
var/original_sprite_datum
+ var/drift_force = MOTH_WING_FORCE
+ var/stabilizer_force = MOTH_WING_FORCE
+
+/obj/item/organ/wings/moth/Initialize(mapload)
+ . = ..()
+ AddComponent( \
+ /datum/component/jetpack, \
+ TRUE, \
+ drift_force, \
+ stabilizer_force, \
+ COMSIG_ORGAN_IMPLANTED, \
+ COMSIG_ORGAN_REMOVED, \
+ null, \
+ CALLBACK(src, PROC_REF(allow_flight)), \
+ null, \
+ )
+
/obj/item/organ/wings/moth/on_mob_insert(mob/living/carbon/receiver)
. = ..()
RegisterSignal(receiver, COMSIG_HUMAN_BURNING, PROC_REF(try_burn_wings))
RegisterSignal(receiver, COMSIG_LIVING_POST_FULLY_HEAL, PROC_REF(heal_wings))
- RegisterSignal(receiver, COMSIG_MOB_CLIENT_MOVE_NOGRAV, PROC_REF(on_client_move))
- RegisterSignal(receiver, COMSIG_MOB_ATTEMPT_HALT_SPACEMOVE, PROC_REF(on_pushoff))
- START_PROCESSING(SSnewtonian_movement, src)
/obj/item/organ/wings/moth/on_mob_remove(mob/living/carbon/organ_owner)
. = ..()
- UnregisterSignal(organ_owner, list(COMSIG_HUMAN_BURNING, COMSIG_LIVING_POST_FULLY_HEAL, COMSIG_MOB_CLIENT_MOVE_NOGRAV, COMSIG_MOB_ATTEMPT_HALT_SPACEMOVE))
- STOP_PROCESSING(SSnewtonian_movement, src)
+ UnregisterSignal(organ_owner, list(COMSIG_HUMAN_BURNING, COMSIG_LIVING_POST_FULLY_HEAL))
/obj/item/organ/wings/moth/make_flap_sound(mob/living/carbon/wing_owner)
playsound(wing_owner, 'sound/mobs/humanoids/moth/moth_flutter.ogg', 50, TRUE)
@@ -38,14 +51,6 @@
/obj/item/organ/wings/moth/proc/allow_flight()
if(!owner || !owner.client)
return FALSE
- if(!isturf(owner.loc))
- return FALSE
- if(!(owner.movement_type & FLOATING) || owner.buckled)
- return FALSE
- if(owner.pulledby)
- return FALSE
- if(owner.throwing)
- return FALSE
if(owner.has_gravity())
return FALSE
if(ishuman(owner))
@@ -59,34 +64,6 @@
return TRUE
return FALSE
-/obj/item/organ/wings/moth/process(seconds_per_tick)
- if (!owner || !allow_flight() || isnull(owner.drift_handler))
- return
-
- var/max_drift_force = (DEFAULT_INERTIA_SPEED / owner.cached_multiplicative_slowdown - 1) / INERTIA_SPEED_COEF + 1
- owner.drift_handler.stabilize_drift(owner.client.intended_direction ? dir2angle(owner.client.intended_direction) : null, owner.client.intended_direction ? max_drift_force : 0, MOTH_WING_FORCE * (seconds_per_tick * 1 SECONDS))
-
-/obj/item/organ/wings/moth/proc/on_client_move(mob/source, list/move_args)
- SIGNAL_HANDLER
-
- if (!allow_flight())
- return
-
- var/max_drift_force = (DEFAULT_INERTIA_SPEED / source.cached_multiplicative_slowdown - 1) / INERTIA_SPEED_COEF + 1
- source.newtonian_move(dir2angle(source.client.intended_direction), instant = TRUE, drift_force = MOTH_WING_FORCE, controlled_cap = max_drift_force)
- source.setDir(source.client.intended_direction)
-
-/obj/item/organ/wings/moth/proc/on_pushoff(mob/source, movement_dir, continuous_move, atom/backup)
- SIGNAL_HANDLER
-
- if (get_dir(source, backup) == movement_dir || source.loc == backup.loc)
- return
-
- if (!allow_flight() || !source.client.intended_direction || (source.client.intended_direction & get_dir(source, backup)))
- return
-
- return COMPONENT_PREVENT_SPACEMOVE_HALT
-
///check if our wings can burn off ;_;
/obj/item/organ/wings/moth/proc/try_burn_wings(mob/living/carbon/human/human)
SIGNAL_HANDLER
diff --git a/code/modules/surgery/organs/internal/cyberimp/augments_chest.dm b/code/modules/surgery/organs/internal/cyberimp/augments_chest.dm
index 8b77ef5ec78b5..603acc0eae9d5 100644
--- a/code/modules/surgery/organs/internal/cyberimp/augments_chest.dm
+++ b/code/modules/surgery/organs/internal/cyberimp/augments_chest.dm
@@ -175,6 +175,7 @@
COMSIG_THRUSTER_DEACTIVATED, \
THRUSTER_ACTIVATION_FAILED, \
CALLBACK(src, PROC_REF(allow_thrust), 0.01), \
+ CALLBACK(src, PROC_REF(allow_thrust), 0.01), \
/datum/effect_system/trail_follow/ion, \
)
diff --git a/code/modules/surgery/organs/internal/cyberimp/augments_internal.dm b/code/modules/surgery/organs/internal/cyberimp/augments_internal.dm
index 42f0e5ac7b237..ffd3f022e7e2a 100644
--- a/code/modules/surgery/organs/internal/cyberimp/augments_internal.dm
+++ b/code/modules/surgery/organs/internal/cyberimp/augments_internal.dm
@@ -6,16 +6,6 @@
organ_flags = ORGAN_ROBOTIC
failing_desc = "seems to be broken."
var/implant_color = COLOR_WHITE
- var/implant_overlay
-
-/obj/item/organ/cyberimp/New(mob/implanted_mob = null)
- if(iscarbon(implanted_mob))
- src.Insert(implanted_mob)
- if(implant_overlay)
- var/mutable_appearance/overlay = mutable_appearance(icon, implant_overlay)
- overlay.color = implant_color
- add_overlay(overlay)
- return ..()
//[[[[BRAIN]]]]
diff --git a/code/modules/surgery/organs/internal/tongue/_tongue.dm b/code/modules/surgery/organs/internal/tongue/_tongue.dm
index e5e54a1e68a4f..abf74a03bdf11 100644
--- a/code/modules/surgery/organs/internal/tongue/_tongue.dm
+++ b/code/modules/surgery/organs/internal/tongue/_tongue.dm
@@ -197,7 +197,7 @@
new /regex(@"\bX([\-|r|R]|\b)", "g") = "ECKS$1",
)
-/obj/item/organ/tongue/lizard/New(class, timer, datum/mutation/human/copymut)
+/obj/item/organ/tongue/lizard/Initialize(mapload)
. = ..()
AddComponent(/datum/component/speechmod, replacements = speech_replacements, should_modify_speech = CALLBACK(src, PROC_REF(should_modify_speech)))
diff --git a/code/modules/surgery/repair_puncture.dm b/code/modules/surgery/repair_puncture.dm
index 10b4925f4e061..77b36d264cdff 100644
--- a/code/modules/surgery/repair_puncture.dm
+++ b/code/modules/surgery/repair_puncture.dm
@@ -144,7 +144,7 @@
)
log_combat(user, target, "dressed burns in", addition="COMBAT MODE: [uppertext(user.combat_mode)]")
pierce_wound.adjust_blood_flow(-0.5)
- if(pierce_wound.blood_flow > 0)
+ if(!QDELETED(pierce_wound) && pierce_wound.blood_flow > 0)
surgery.status = REALIGN_INNARDS
to_chat(user, span_notice("There still seems to be misaligned blood vessels to finish..."))
else
diff --git a/code/modules/transport/elevator/elev_panel.dm b/code/modules/transport/elevator/elev_panel.dm
index 659049a7448ca..162c70f390cee 100644
--- a/code/modules/transport/elevator/elev_panel.dm
+++ b/code/modules/transport/elevator/elev_panel.dm
@@ -19,6 +19,7 @@
icon_state = "elevpanel0"
base_icon_state = "elevpanel"
+ mouse_over_pointer = MOUSE_HAND_POINTER
power_channel = AREA_USAGE_ENVIRON
// Indestructible until someone wants to make these constructible, with all the chaos that implies
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
diff --git a/code/modules/transport/tram/tram_controller.dm b/code/modules/transport/tram/tram_controller.dm
index 37220034b664b..1eeed96375f08 100644
--- a/code/modules/transport/tram/tram_controller.dm
+++ b/code/modules/transport/tram/tram_controller.dm
@@ -54,7 +54,7 @@
var/recovery_clear_count = 0
///if the tram's next stop will be the tram malfunction event sequence
- var/malf_active = FALSE
+ var/malf_active = TRANSPORT_SYSTEM_NORMAL
///fluff information of the tram, such as ongoing kill count and age
var/datum/tram_mfg_info/tram_registration
@@ -259,14 +259,16 @@
playsound(paired_cabinet, 'sound/machines/synth/synth_yes.ogg', 40, vary = FALSE, extrarange = SHORT_RANGE_SOUND_EXTRARANGE)
paired_cabinet.say("Controller reset.")
- if(malf_active)
- addtimer(CALLBACK(src, PROC_REF(announce_malf_event)), 1 SECONDS)
-
SEND_SIGNAL(src, COMSIG_TRAM_TRAVEL, idle_platform, destination_platform)
for(var/obj/structure/transport/linear/tram/transport_module as anything in transport_modules) //only thing everyone needs to know is the new location.
if(transport_module.travelling) //wee woo wee woo there was a double action queued. damn multi tile structs
return //we don't care to undo cover_locked controls, though, as that will resolve itself
+ if(malf_active == TRANSPORT_LOCAL_WARNING)
+ if(transport_module.check_for_humans())
+ throw_chance *= 1.75
+ malf_active = TRANSPORT_LOCAL_FAULT
+ addtimer(CALLBACK(src, PROC_REF(announce_malf_event)), 1 SECONDS)
transport_module.verify_transport_contents()
transport_module.glide_size_override = DELAY_TO_GLIDE_SIZE(speed_limiter)
transport_module.set_travelling(TRUE)
@@ -296,7 +298,7 @@
return PROCESS_KILL
if(!travel_remaining)
- if(!controller_operational || malf_active)
+ if(!controller_operational || malf_active == TRANSPORT_LOCAL_FAULT)
degraded_stop()
else
normal_stop()
@@ -370,10 +372,10 @@
paired_cabinet.say("Controller reset.")
log_transport("TC: [specific_transport_id] position data successfully reset. ")
speed_limiter = initial(speed_limiter)
- if(malf_active)
+ if(malf_active == TRANSPORT_LOCAL_FAULT)
set_status_code(SYSTEM_FAULT, TRUE)
addtimer(CALLBACK(src, PROC_REF(cycle_doors), CYCLE_OPEN), 2 SECONDS)
- malf_active = FALSE
+ malf_active = TRANSPORT_SYSTEM_NORMAL
throw_chance = initial(throw_chance)
playsound(paired_cabinet, 'sound/machines/buzz/buzz-sigh.ogg', 60, vary = FALSE, extrarange = SHORT_RANGE_SOUND_EXTRARANGE)
paired_cabinet.say("Controller error. Please contact your engineering department.")
@@ -417,6 +419,7 @@
* Performs a reset of the tram's position data by finding a predetermined reference landmark, then driving to it.
*/
/datum/transport_controller/linear/tram/proc/reset_position()
+ malf_active = TRANSPORT_SYSTEM_NORMAL
if(idle_platform)
if(get_turf(idle_platform) == get_turf(nav_beacon))
set_status_code(SYSTEM_FAULT, FALSE)
@@ -602,7 +605,8 @@
* Tram malfunction random event. Set comm error, requiring engineering or AI intervention.
*/
/datum/transport_controller/linear/tram/proc/start_malf_event()
- malf_active = TRUE
+ malf_active = TRANSPORT_LOCAL_WARNING
+ paired_cabinet.update_appearance()
throw_chance *= 1.25
log_transport("TC: [specific_transport_id] starting Tram Malfunction event.")
@@ -615,7 +619,8 @@
/datum/transport_controller/linear/tram/proc/end_malf_event()
if(!(malf_active))
return
- malf_active = FALSE
+ malf_active = TRANSPORT_SYSTEM_NORMAL
+ paired_cabinet.update_appearance()
throw_chance = initial(throw_chance)
log_transport("TC: [specific_transport_id] ending Tram Malfunction event.")
@@ -978,7 +983,7 @@
. += emissive_appearance(icon, "[base_icon_state]-estop", src, alpha = src.alpha)
return
- if(controller_datum.controller_status & SYSTEM_FAULT || controller_datum.malf_active)
+ if(controller_datum.controller_status & SYSTEM_FAULT || controller_datum.malf_active != TRANSPORT_SYSTEM_NORMAL)
. += mutable_appearance(icon, "[base_icon_state]-fault")
. += emissive_appearance(icon, "[base_icon_state]-fault", src, alpha = src.alpha)
return
@@ -1079,7 +1084,7 @@
"recoveryMode" = controller_datum.recovery_mode,
"currentSpeed" = controller_datum.current_speed,
"currentLoad" = controller_datum.current_load,
- "statusSF" = controller_datum.controller_status & SYSTEM_FAULT,
+ "statusSF" = controller_datum.controller_status & SYSTEM_FAULT || controller_datum.malf_active != TRANSPORT_SYSTEM_NORMAL,
"statusCE" = controller_datum.controller_status & COMM_ERROR,
"statusES" = controller_datum.controller_status & EMERGENCY_STOP,
"statusPD" = controller_datum.controller_status & PRE_DEPARTURE,
diff --git a/code/modules/transport/tram/tram_structures.dm b/code/modules/transport/tram/tram_structures.dm
index 346cb5e680283..9b04bba6ce7e3 100644
--- a/code/modules/transport/tram/tram_structures.dm
+++ b/code/modules/transport/tram/tram_structures.dm
@@ -474,8 +474,8 @@
canSmoothWith = null
/// Position of the spoiler
var/deployed = FALSE
- /// Malfunctioning due to tampering or emag
- var/malfunctioning = FALSE
+ /// Locked in position
+ var/locked = FALSE
/// Weakref to the tram piece we control
var/datum/weakref/tram_ref
/// The tram we're attached to
@@ -494,7 +494,7 @@
context[SCREENTIP_CONTEXT_LMB] = "repair"
if(held_item?.tool_behaviour == TOOL_WELDER && atom_integrity >= max_integrity)
- context[SCREENTIP_CONTEXT_LMB] = "[malfunctioning ? "repair" : "lock"]"
+ context[SCREENTIP_CONTEXT_LMB] = "[locked ? "repair" : "sabotage"]"
return CONTEXTUAL_SCREENTIP_SET
@@ -503,22 +503,19 @@
if(obj_flags & EMAGGED)
. += span_warning("The electronics panel is sparking occasionally. It can be reset with a [EXAMINE_HINT("multitool.")]")
- if(malfunctioning)
+ if(locked)
. += span_warning("The spoiler is [EXAMINE_HINT("welded")] in place!")
else
- . += span_notice("The spoiler can be locked in to place with a [EXAMINE_HINT("welder.")]")
+ . += span_notice("The spoiler can be locked in place with a [EXAMINE_HINT("welder.")]")
/obj/structure/tram/spoiler/proc/set_spoiler(source, controller, controller_active, controller_status, travel_direction)
SIGNAL_HANDLER
var/spoiler_direction = travel_direction
- if(obj_flags & EMAGGED && !malfunctioning)
- malfunctioning = TRUE
-
- if(malfunctioning || controller_status & COMM_ERROR)
+ if(locked || controller_status & COMM_ERROR || obj_flags & EMAGGED)
if(!deployed)
// Bring out the blades
- if(malfunctioning)
+ if(locked)
visible_message(span_danger("\the [src] locks up due to its servo overheating!"))
do_sparks(3, cardinal_only = FALSE, source = src)
deploy_spoiler()
@@ -583,14 +580,14 @@
return FALSE
if(atom_integrity >= max_integrity)
- to_chat(user, span_warning("You begin to weld \the [src], [malfunctioning ? "repairing damage" : "preventing retraction"]."))
+ to_chat(user, span_warning("You begin to weld \the [src], [locked ? "repairing damage" : "preventing retraction"]."))
if(!tool.use_tool(src, user, 4 SECONDS, volume = 50))
return
- malfunctioning = !malfunctioning
- user.visible_message(span_warning("[user] [malfunctioning ? "welds \the [src] in place" : "repairs \the [src]"] with [tool]."), \
- span_warning("You finish welding \the [src], [malfunctioning ? "locking it in place." : "it can move freely again!"]"), null, COMBAT_MESSAGE_RANGE)
+ locked = !locked
+ user.visible_message(span_warning("[user] [locked ? "welds \the [src] in place" : "repairs \the [src]"] with [tool]."), \
+ span_warning("You finish welding \the [src], [locked ? "locking it in place." : "it can move freely again!"]"), null, COMBAT_MESSAGE_RANGE)
- if(malfunctioning)
+ if(locked)
deploy_spoiler()
update_appearance()
@@ -606,7 +603,7 @@
/obj/structure/tram/spoiler/update_overlays()
. = ..()
- if(deployed && malfunctioning)
+ if(deployed && locked)
. += mutable_appearance(icon, "tram-spoiler-welded")
/obj/structure/chair/sofa/bench/tram
diff --git a/code/modules/transport/transport_module.dm b/code/modules/transport/transport_module.dm
index b0497ed3b2e9c..d1384067a0d1a 100644
--- a/code/modules/transport/transport_module.dm
+++ b/code/modules/transport/transport_module.dm
@@ -171,6 +171,13 @@
if(!(movable_contents.loc in locs))
remove_item_from_transport(movable_contents)
+/obj/structure/transport/linear/proc/check_for_humans()
+ for(var/atom/movable/movable_contents as anything in transport_contents)
+ if(ishuman(movable_contents))
+ return TRUE
+
+ return FALSE
+
///signal handler for COMSIG_MOVABLE_UPDATE_GLIDE_SIZE: when a movable in transport_contents changes its glide_size independently.
///adds that movable to a lazy list, movables in that list have their glide_size updated when the tram next moves
/obj/structure/transport/linear/proc/on_changed_glide_size(atom/movable/moving_contents, new_glide_size)
diff --git a/code/modules/tutorials/tutorial_skip.dm b/code/modules/tutorials/tutorial_skip.dm
index 803aebc865054..48c4a9550dbc1 100644
--- a/code/modules/tutorials/tutorial_skip.dm
+++ b/code/modules/tutorials/tutorial_skip.dm
@@ -6,6 +6,7 @@
alpha = 0
mouse_opacity = MOUSE_OPACITY_OPAQUE
layer = TUTORIAL_INSTRUCTIONS_LAYER
+ mouse_over_pointer = MOUSE_HAND_POINTER
var/atom/movable/screen/tutorial_skip_text/skip_text
/atom/movable/screen/tutorial_skip/Initialize(mapload, datum/hud/hud_owner)
diff --git a/code/modules/unit_tests/fish_unit_tests.dm b/code/modules/unit_tests/fish_unit_tests.dm
index 767c1ceeaebfa..7ed7851b86af2 100644
--- a/code/modules/unit_tests/fish_unit_tests.dm
+++ b/code/modules/unit_tests/fish_unit_tests.dm
@@ -23,8 +23,7 @@
/datum/unit_test/fish_size_weight/Run()
var/obj/structure/table/table = allocate(/obj/structure/table)
- var/obj/item/fish/testdummy/fish = new /obj/item/fish/testdummy (table.loc)
- allocated += fish
+ var/obj/item/fish/testdummy/fish = allocate(__IMPLIED_TYPE__, table.loc)
var/datum/reagent/reagent = fish.reagents?.has_reagent(/datum/reagent/fishdummy)
TEST_ASSERT(reagent, "the test fish doesn't have the test reagent.[fish.reagents ? "" : " It doesn't even have a reagent holder."]")
var/expected_units = FISH_REAGENT_AMOUNT * fish.weight / FISH_WEIGHT_BITE_DIVISOR
@@ -42,14 +41,32 @@
allocated += content
TEST_ASSERT_EQUAL(counted_fillets, expected_num_fillets, "the test fish yielded [counted_fillets] fillets when it should have been [expected_num_fillets]")
+/// Make sure fish don't stay hungry after being fed
+/datum/unit_test/fish_feeding
+
+/datum/unit_test/fish_feeding/Run()
+ var/obj/item/fish/testdummy/hungry = allocate(__IMPLIED_TYPE__)
+ hungry.last_feeding = 0 //the fish should be hungry.
+ TEST_ASSERT(hungry.get_hunger(), "the fish doesn't seem to be hungry in the slightest")
+ var/obj/item/reagent_containers/cup/fish_feed/yummy = allocate(__IMPLIED_TYPE__)
+ hungry.feed(yummy.reagents)
+ TEST_ASSERT(!hungry.get_hunger(), "the fish is still hungry despite having been just fed")
+
+ ///Try feeding it again, but this time with the right hunger so they actually grow
+ hungry.last_feeding = world.time - (hungry.feeding_frequency * FISH_GROWTH_PEAK)
+ var/old_size = hungry.size
+ var/old_weight = hungry.weight
+ hungry.feed(yummy.reagents)
+ TEST_ASSERT(hungry.size > old_size, "the fish size didn't increase after being properly fed")
+ TEST_ASSERT(hungry.weight > old_weight, "the fish weight didn't increase after being properly fed")
+
///Checks that fish breeding works correctly.
/datum/unit_test/fish_breeding
/datum/unit_test/fish_breeding/Run()
- var/obj/item/fish/fish = allocate(/obj/item/fish/testdummy)
+ var/obj/item/fish_tank/reproduction/fish_tank = allocate(__IMPLIED_TYPE__)
///Check if the fishes can generate offsprings at all.
- var/obj/item/fish/fish_two = allocate(/obj/item/fish/testdummy/two)
- var/obj/item/fish/new_fish = fish.create_offspring(fish_two.type, fish_two)
+ var/obj/item/fish/new_fish = fish_tank.fish.try_to_reproduce()
TEST_ASSERT(new_fish, "the two test fishes couldn't generate an offspring")
var/traits_len = length(new_fish.fish_traits)
TEST_ASSERT_NOTEQUAL(traits_len, 2, "the offspring of the test fishes has both parents' traits, which are incompatible with each other")
@@ -66,6 +83,20 @@
TEST_ASSERT(cloner_jr, "The test aquarium's cloner fish didn't manage to reproduce when it should have")
TEST_ASSERT_NOTEQUAL(cloner_jr.type, aquarium.sterile.type, "The test aquarium's cloner fish mated with the sterile fish")
+/obj/item/fish_tank/reproduction
+ var/obj/item/fish/testdummy/small/fish
+ var/obj/item/fish/testdummy/small/partner
+
+/obj/item/fish_tank/reproduction/Initialize(mapload)
+ . = ..()
+ fish = new(src)
+ partner = new(src)
+
+/obj/item/fish_tank/reproduction/Destroy()
+ fish = null
+ partner = null
+ return ..()
+
///Checks that fish evolutions work correctly.
/datum/unit_test/fish_evolution
@@ -104,6 +135,10 @@
fish_id_redirect_path = /obj/item/fish/goldfish //Stops SSfishing from complaining
var/expected_num_fillets = 0 //used to know how many fillets should be gotten out of this fish
+/obj/item/fish/testdummy/small
+ // The parent type is too big to reproduce inside the more compact fish tank
+ average_size = /obj/item/fish_tank::max_total_size * 0.2
+
/obj/item/fish/testdummy/add_fillet_type()
expected_num_fillets = ..()
return expected_num_fillets
diff --git a/code/modules/unit_tests/unit_test.dm b/code/modules/unit_tests/unit_test.dm
index 6a2bda4ee25af..241d7b54c39af 100644
--- a/code/modules/unit_tests/unit_test.dm
+++ b/code/modules/unit_tests/unit_test.dm
@@ -254,6 +254,8 @@ GLOBAL_VAR_INIT(focused_tests, focused_tests())
//Yet more templates
/obj/machinery/restaurant_portal,
//Template type
+ /obj/machinery/power/turbine,
+ //Template type
/obj/effect/mob_spawn,
//Template type
/obj/structure/holosign/robot_seat,
diff --git a/code/modules/uplink/uplink_items.dm b/code/modules/uplink/uplink_items.dm
index dc8b776131e59..1782f836bea70 100644
--- a/code/modules/uplink/uplink_items.dm
+++ b/code/modules/uplink/uplink_items.dm
@@ -194,7 +194,8 @@
return
QDEL_NULL(gun_reward.pin)
- gun_reward.pin = new /obj/item/firing_pin(gun_reward)
+ var/obj/item/firing_pin/pin = new
+ pin.gun_insert(new_gun = gun_reward)
///For special overrides if an item can be bought or not.
/datum/uplink_item/proc/can_be_bought(datum/uplink_handler/source)
diff --git a/code/modules/uplink/uplink_items/job.dm b/code/modules/uplink/uplink_items/job.dm
index 953a6cf7ace5d..935461509ab5d 100644
--- a/code/modules/uplink/uplink_items/job.dm
+++ b/code/modules/uplink/uplink_items/job.dm
@@ -258,7 +258,7 @@
progression_minimum = 15 MINUTES
item = /obj/item/gun/chem
cost = 12
- restricted_roles = list(JOB_CHEMIST, JOB_CHIEF_MEDICAL_OFFICER, JOB_BOTANIST)
+ restricted_roles = list(JOB_CHEMIST, JOB_MEDICAL_DOCTOR, JOB_CHIEF_MEDICAL_OFFICER, JOB_BOTANIST)
/datum/uplink_item/role_restricted/pie_cannon
name = "Banana Cream Pie Cannon"
diff --git a/code/modules/vehicles/mecha/combat/durand.dm b/code/modules/vehicles/mecha/combat/durand.dm
index 1497c4c615de7..6995206942938 100644
--- a/code/modules/vehicles/mecha/combat/durand.dm
+++ b/code/modules/vehicles/mecha/combat/durand.dm
@@ -274,7 +274,7 @@ own integrity back to max. Shield is automatically dropped if we run out of powe
flick("shield_impact", src)
if(!.)
return
- if(!chassis.use_energy(. * (STANDARD_CELL_CHARGE / 15)))
+ if(!chassis.use_energy(. * (STANDARD_CELL_CHARGE / 150)))
chassis.cell?.charge = 0
for(var/O in chassis.occupants)
var/mob/living/occupant = O
diff --git a/code/modules/vehicles/mecha/equipment/tools/other_tools.dm b/code/modules/vehicles/mecha/equipment/tools/other_tools.dm
index 4d3b682b4277b..15cc3e6b8cdb5 100644
--- a/code/modules/vehicles/mecha/equipment/tools/other_tools.dm
+++ b/code/modules/vehicles/mecha/equipment/tools/other_tools.dm
@@ -285,7 +285,7 @@
///Maximum fuel capacity of the generator, in units
var/max_fuel = 75 * SHEET_MATERIAL_AMOUNT
///Energy recharged per second
- var/rechargerate = 0.005 * STANDARD_CELL_RATE
+ var/rechargerate = 0.05 * STANDARD_CELL_RATE
/obj/item/mecha_parts/mecha_equipment/generator/Initialize(mapload)
. = ..()
diff --git a/code/modules/vending/mail.dm b/code/modules/vending/mail.dm
new file mode 100644
index 0000000000000..1e091a3128756
--- /dev/null
+++ b/code/modules/vending/mail.dm
@@ -0,0 +1,309 @@
+#define STATE_SORTING "sorting"
+#define STATE_IDLE "idle"
+#define STATE_YES "yes"
+#define STATE_NO "no"
+#define MAIL_CAPACITY 100
+
+/obj/machinery/mailsorter
+ name = "mail sorter"
+ desc = "A large mail sorting unit. Sorting mail since 1987!"
+ icon = 'icons/obj/machines/mailsorter.dmi'
+ icon_state = "mailsorter"
+ base_icon_state = "mailsorter"
+ layer = BELOW_OBJ_LAYER
+ density = TRUE
+ max_integrity = 300
+ integrity_failure = 0.33
+ req_access = list(ACCESS_CARGO)
+ circuit = /obj/item/circuitboard/machine/mailsorter
+
+ var/light_mask = "mailsorter-light-mask"
+ var/panel_type = "panel"
+
+ /// What the machine is currently doing. Can be "sorting", "idle", "yes", "no".
+ var/currentstate = STATE_IDLE
+ /// List of all mail that's inside the mailbox.
+ var/list/mail_list = list()
+ /// The direction in which the mail will be unloaded.
+ var/output_dir = SOUTH
+ /// List of the departments to sort the mail for.
+ var/static/list/sorting_departments = list(
+ DEPARTMENT_ENGINEERING,
+ DEPARTMENT_SECURITY,
+ DEPARTMENT_MEDICAL,
+ DEPARTMENT_SCIENCE,
+ DEPARTMENT_CARGO,
+ DEPARTMENT_SERVICE,
+ DEPARTMENT_COMMAND,
+ )
+ var/static/list/choices = list(
+ "Eject" = icon('icons/hud/radial.dmi', "radial_eject"),
+ "Dump" = icon('icons/hud/radial.dmi', "mail_dump"),
+ "Sort" = icon('icons/hud/radial.dmi', "mail_sort"),
+ )
+
+/// Steps one tile in the `output_dir`. Returns `turf`.
+/obj/machinery/mailsorter/proc/get_unload_turf()
+ return get_step(src, output_dir)
+
+/obj/machinery/mailsorter/screwdriver_act(mob/living/user, obj/item/tool)
+ default_deconstruction_screwdriver(user, "[base_icon_state]-off", base_icon_state, tool)
+ update_appearance(UPDATE_OVERLAYS)
+ return ITEM_INTERACT_SUCCESS
+
+/obj/machinery/mailsorter/crowbar_act(mob/living/user, obj/item/tool)
+ default_deconstruction_crowbar(tool)
+ return ITEM_INTERACT_SUCCESS
+
+/obj/machinery/mailsorter/examine(mob/user)
+ . = ..()
+ . += span_notice("There is[length(mail_list) < 100 ? " " : " no more "]space for [length(mail_list) < 100 ? "[100 - length(mail_list)] " : ""]envelope\s inside.")
+ . += span_notice("There [length(mail_list) >= 2 ? "are" : "is"] [length(mail_list) ? length(mail_list) : "no"] envelope\s inside.")
+ if(panel_open)
+ . += span_notice("Alt-click to rotate the output direction.")
+
+/obj/machinery/mailsorter/Destroy()
+ drop_all_mail()
+ . = ..()
+
+/// Drops all enevlopes on the machine turf. Only occurs when the machine is broken.
+/obj/machinery/mailsorter/proc/drop_all_mail(damage_flag)
+ if(!isturf(get_turf(src)))
+ QDEL_LIST(mail_list)
+ return
+ for(var/obj/item/mail in mail_list)
+ mail.forceMove(src)
+ mail_list -= mail
+
+/// Dumps all envelopes on the `unload_turf`.
+/obj/machinery/mailsorter/proc/dump_all_mail()
+ if(!isturf(get_turf(src)))
+ QDEL_LIST(mail_list)
+ return
+ var/turf/unload_turf = get_unload_turf()
+ for(var/obj/item/mail in mail_list)
+ mail.forceMove(unload_turf)
+ mail.throw_at(unload_turf, 2, 3)
+ mail_list -= mail
+
+/// Validates whether the inserted item is acceptable.
+/obj/machinery/mailsorter/proc/accept_check(obj/item/weapon)
+ var/static/list/accepted_items = list(
+ /obj/item/mail,
+ /obj/item/mail/envelope,
+ /obj/item/mail/junkmail,
+ /obj/item/mail/mail_strike,
+ /obj/item/mail/traitor,
+ /obj/item/paper,
+ )
+ return is_type_in_list(weapon, accepted_items)
+
+/obj/machinery/mailsorter/interact(mob/user)
+ if (!allowed(user))
+ to_chat(user, span_warning("Access denied."))
+ return
+ if (currentstate != STATE_IDLE)
+ return
+ if (length(mail_list) == 0)
+ to_chat(user, span_warning("There's no mail inside!"))
+ return
+ var/choice = show_radial_menu(
+ user,
+ src,
+ choices,
+ require_near = !HAS_SILICON_ACCESS(user),
+ autopick_single_option = FALSE,
+ )
+ if (!choice)
+ return
+ switch (choice)
+ if ("Eject")
+ pick_mail(user)
+ if ("Dump")
+ playsound(src, 'sound/machines/buzz/buzz-sigh.ogg', 20, TRUE)
+ to_chat(user, span_notice("[src] dumps [length(mail_list)] envelope\s on the floor."))
+ dump_all_mail()
+ if ("Sort")
+ sort_mail(user)
+
+/// Prompts the player to select a department to sort the mail for. Returns if `null`.
+/obj/machinery/mailsorter/proc/sort_mail(mob/user)
+ var/sorting_dept = tgui_input_list(user, "Choose the department to sort mail for","Mail Sorting", sorting_departments)
+ if (!sorting_dept)
+ return
+ currentstate = STATE_SORTING
+ update_appearance(UPDATE_OVERLAYS)
+ playsound(src, 'sound/machines/mail_sort.ogg', 20, TRUE)
+ addtimer(CALLBACK(src, PROC_REF(continue_sort), user, sorting_dept), 5 SECONDS)
+
+/// Sorts the mail based on the picked department. Ejects the sorted envelopes onto the `unload_turf`.
+/obj/machinery/mailsorter/proc/continue_sort(mob/user, sorting_dept)
+ var/list/sorted_mail = list()
+ var/total_to_sort = length(mail_list)
+ var/sorted = 0
+ var/unable_to_sort = 0
+
+ for (var/obj/item/mail/some_mail in mail_list)
+ if (!some_mail.recipient_ref)
+ unable_to_sort ++
+ continue
+ var/datum/mind/some_recipient = some_mail.recipient_ref.resolve()
+ if (some_recipient)
+ var/datum/job/recipient_job = some_recipient.assigned_role
+ var/datum/job_department/primary_department = recipient_job.departments_list?[1]
+ var/datum/job_department/main_department = primary_department.department_name
+ if (main_department == sorting_dept)
+ sorted_mail.Add(some_mail)
+ sorted ++
+ else
+ unable_to_sort ++
+ if (length(sorted_mail) == 0)
+ currentstate = STATE_NO
+ update_appearance(UPDATE_OVERLAYS)
+ playsound(src, 'sound/machines/buzz/buzz-sigh.ogg', 20, TRUE)
+ say("No mail for the following department: [sorting_dept].")
+ else
+ currentstate = STATE_YES
+ update_appearance(UPDATE_OVERLAYS)
+ say("[sorted] envelope\s sorted successfully.")
+ playsound(src, 'sound/machines/ping.ogg', 20, TRUE)
+ to_chat(user, span_notice("[src] ejects [length(sorted_mail)] envelope\s."))
+ var/turf/unload_turf = get_unload_turf()
+ for (var/obj/item/mail/mail_in_list in sorted_mail)
+ mail_in_list.forceMove(unload_turf)
+ sorted_mail -= mail_in_list
+ mail_list -= mail_in_list
+ addtimer(CALLBACK(src, PROC_REF(check_sorted), unable_to_sort, total_to_sort), 1 SECONDS)
+
+/// Informs the player of the amount of processed envelopes.
+/obj/machinery/mailsorter/proc/check_sorted(mob/user, unable_to_sort, total_to_sort)
+ if (unable_to_sort > 0)
+ playsound(src, 'sound/machines/buzz/buzz-sigh.ogg', 20, TRUE)
+ say("Couldn't sort [unable_to_sort] envelope\s.")
+ else
+ playsound(src, 'sound/machines/ping.ogg', 20, TRUE)
+ say("[total_to_sort] envelope\s processed.")
+ addtimer(CALLBACK(src, PROC_REF(update_state_after_sorting)), 1 SECONDS)
+
+/obj/machinery/mailsorter/proc/update_state_after_sorting()
+ currentstate = STATE_IDLE
+ update_appearance(UPDATE_OVERLAYS)
+
+/obj/machinery/mailsorter/item_interaction(mob/user, obj/item/thingy, params)
+ if (istype(thingy, /obj/item/storage/bag/mail))
+ if (length(thingy.contents) < 1)
+ to_chat(user, span_warning("The [thingy] is empty!"))
+ return
+ var/loaded = 0
+ for (var/obj/item/mail in thingy.contents)
+ if (!(mail.item_flags & ABSTRACT) && \
+ !(mail.flags_1 & HOLOGRAM_1) && \
+ accept_check(mail) \
+ )
+ if (length(mail_list) + 1 > MAIL_CAPACITY )
+ to_chat(user, span_warning("There is no space for more mail in [src]!"))
+ return FALSE
+ else if (load(mail, user))
+ loaded++
+ mail_list += mail
+ if(loaded)
+ user.visible_message(span_notice("[user] loads \the [src] with \the [thingy]."), \
+ span_notice("You load \the [src] with \the [thingy]."))
+ if(length(thingy.contents))
+ to_chat(user, span_warning("Some items are refused."))
+ return TRUE
+ else
+ to_chat(user, span_warning("There is nothing in \the [thingy] to put in the [src]!"))
+ return FALSE
+ else if (istype(thingy, /obj/item/mail))
+ if (length(mail_list) + 1 > MAIL_CAPACITY )
+ to_chat(user, span_warning("There is no space for more mail in [src]!"))
+ else
+ thingy.forceMove(src)
+ mail_list += thingy
+ to_chat(user, span_notice("The [src] whizzles as it accepts the [thingy]."))
+
+/// Prompts the user to select an anvelope from the list of all the envelopes inside.
+/obj/machinery/mailsorter/proc/pick_mail(mob/user)
+ if(!length(mail_list))
+ return
+ var/obj/item/mail/mail_throw = tgui_input_list(user, "Choose the envelope to eject","Mail Sorting", mail_list)
+ if(!mail_throw)
+ return
+ currentstate = STATE_SORTING
+ update_appearance(UPDATE_OVERLAYS)
+ playsound(src, 'sound/machines/mail_sort.ogg', 20, TRUE)
+ addtimer(CALLBACK(src, PROC_REF(pick_envelope), user, mail_throw), 50)
+
+/// Ejects a single envelope the player has picked onto the `unload_turf`.
+/obj/machinery/mailsorter/proc/pick_envelope(mob/user, obj/item/mail/mail_throw)
+ to_chat(user, span_notice("[src] reluctantly spits out [mail_throw]."))
+ var/turf/unload_turf = get_unload_turf()
+ mail_throw.forceMove(unload_turf)
+ mail_throw.throw_at(unload_turf, 2, 3)
+ mail_list -= mail_throw
+ currentstate = STATE_IDLE
+ update_appearance(UPDATE_OVERLAYS)
+
+/// Tries to load something into the machine.
+/obj/machinery/mailsorter/proc/load(obj/item/thingy, mob/user)
+ if(ismob(thingy.loc))
+ var/mob/owner = thingy.loc
+ if(!owner.transferItemToLoc(thingy, src))
+ to_chat(owner, span_warning("\the [thingy] is stuck to your hand, you cannot put it in \the [src]!"))
+ return FALSE
+ return TRUE
+ else
+ if(thingy.loc.atom_storage)
+ return thingy.loc.atom_storage.attempt_remove(thingy, src, silent = TRUE)
+ else
+ thingy.forceMove(src)
+ return TRUE
+
+/obj/machinery/mailsorter/click_alt(mob/living/user)
+ if(!panel_open)
+ return CLICK_ACTION_BLOCKING
+ output_dir = turn(output_dir, -90)
+ to_chat(user, span_notice("You change [src]'s I/O settings, setting the output to [dir2text(output_dir)]."))
+ update_appearance(UPDATE_OVERLAYS)
+ return CLICK_ACTION_SUCCESS
+
+
+/obj/machinery/mailsorter/update_overlays()
+ . = ..()
+ if(!powered())
+ return
+ if(!(machine_stat & BROKEN))
+ var/image/mail_output = image(icon='icons/obj/doors/airlocks/station/overlays.dmi', icon_state="unres_[output_dir]")
+ switch(output_dir)
+ if(NORTH)
+ mail_output.pixel_y = 32
+ if(SOUTH)
+ mail_output.pixel_y = -32
+ if(EAST)
+ mail_output.pixel_x = 32
+ if(WEST)
+ mail_output.pixel_x = -32
+ mail_output.color = COLOR_CRAYON_ORANGE
+ var/mutable_appearance/light_out = emissive_appearance(mail_output.icon, mail_output.icon_state, offset_spokesman = src, alpha = mail_output.alpha)
+ light_out.pixel_y = mail_output.pixel_y
+ light_out.pixel_x = mail_output.pixel_x
+ . += mail_output
+ . += light_out
+ . += mutable_appearance(base_icon_state, currentstate)
+ if(panel_open)
+ . += panel_type
+ if(light_mask && !(machine_stat & BROKEN))
+ . += emissive_appearance(icon, light_mask, src)
+
+/obj/machinery/mailsorter/update_icon_state()
+ icon_state = "[base_icon_state][powered() ? null : "-off"]"
+ if(machine_stat & BROKEN)
+ icon_state = "[base_icon_state]-broken"
+ return ..()
+
+#undef STATE_SORTING
+#undef STATE_IDLE
+#undef STATE_YES
+#undef STATE_NO
+#undef MAIL_CAPACITY
diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm
index cbc2fa73185cf..6fdd8f5d25e1c 100644
--- a/code/modules/vending/wardrobes.dm
+++ b/code/modules/vending/wardrobes.dm
@@ -202,6 +202,7 @@ GLOBAL_VAR_INIT(roaches_deployed, FALSE)
/obj/item/storage/bag/mail = 3,
/obj/item/radio/headset/headset_cargo = 3,
/obj/item/clothing/accessory/pocketprotector = 3,
+ /obj/item/flatpack/mailsorter = 1,
)
premium = list(
/obj/item/clothing/head/costume/mailman = 1,
diff --git a/dependencies.sh b/dependencies.sh
index d9b286e61aed5..1046b72c12d77 100644
--- a/dependencies.sh
+++ b/dependencies.sh
@@ -8,7 +8,7 @@ export BYOND_MAJOR=515
export BYOND_MINOR=1637
#rust_g git tag
-export RUST_G_VERSION=3.3.0
+export RUST_G_VERSION=3.5.1
#node version
export NODE_VERSION_LTS=22.11.0
diff --git a/html/changelogs/AutoChangeLog-pr-88254.yml b/html/changelogs/AutoChangeLog-pr-88254.yml
new file mode 100644
index 0000000000000..e2ee830005d84
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-88254.yml
@@ -0,0 +1,5 @@
+author: "SyncIt21"
+delete-after: True
+changes:
+ - bugfix: "Turbine converts energy to power correctly & shows correct reading with multitool"
+ - refactor: "turbine code has been overall improved. report bugs on github"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-88319.yml b/html/changelogs/AutoChangeLog-pr-88319.yml
deleted file mode 100644
index bb09fca18c3ce..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-88319.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "SmArtKar"
-delete-after: True
-changes:
- - qol: "Shifted the escape menu stat panel down a bit"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-88321.yml b/html/changelogs/AutoChangeLog-pr-88321.yml
deleted file mode 100644
index 4da9add265994..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-88321.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "13spacemen"
-delete-after: True
-changes:
- - rscdel: "Time Dilation no longer shows in the hub text"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-88344.yml b/html/changelogs/AutoChangeLog-pr-88344.yml
deleted file mode 100644
index e2b3493e8c5d8..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-88344.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Ben10Omintrix"
-delete-after: True
-changes:
- - bugfix: "repairbots now gain their destructive abilities when hacked by an AI"
- - bugfix: "repairbot crafting recipes have been updated"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-88435.yml b/html/changelogs/AutoChangeLog-pr-88435.yml
new file mode 100644
index 0000000000000..0f91aa47c2209
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-88435.yml
@@ -0,0 +1,4 @@
+author: "tontyGH"
+delete-after: True
+changes:
+ - bugfix: "Underlining your messages in loud mode shouldn't break anymore"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-88492.yml b/html/changelogs/AutoChangeLog-pr-88492.yml
new file mode 100644
index 0000000000000..3b1598c748c0f
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-88492.yml
@@ -0,0 +1,4 @@
+author: "SmArtKar"
+delete-after: True
+changes:
+ - qol: "Jetpacks should ACTUALLY feel better now"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-88508.yml b/html/changelogs/AutoChangeLog-pr-88508.yml
new file mode 100644
index 0000000000000..30b95cd438a3c
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-88508.yml
@@ -0,0 +1,4 @@
+author: "JoshAdamPowell"
+delete-after: True
+changes:
+ - map: "In the new year's budget the syndicate have decided that chemists need beakers to do their job properly."
\ No newline at end of file
diff --git a/html/changelogs/archive/2024-12.yml b/html/changelogs/archive/2024-12.yml
index c2df09a887411..210a0f1e6f04a 100644
--- a/html/changelogs/archive/2024-12.yml
+++ b/html/changelogs/archive/2024-12.yml
@@ -128,3 +128,269 @@
Wallem:
- image: Updates slime potion sprites, adds some new colors and rearranges some
others.
+2024-12-05:
+ 13spacemen:
+ - rscdel: Time Dilation no longer shows in the hub text
+ Ben10Omintrix:
+ - bugfix: repairbots now gain their destructive abilities when hacked by an AI
+ - bugfix: repairbot crafting recipes have been updated
+ Majkl-J:
+ - bugfix: Ruins will now correctly spawn their tied ruins in
+ - bugfix: The map_logging test now runs proper
+ - code_imp: The stacked_lights test now screams with area names too.
+ SmArtKar:
+ - qol: Shifted the escape menu stat panel down a bit
+2024-12-06:
+ Autisem:
+ - refactor: Nanotrasen has introducted new upgrades into the aging station shield
+ statalites, they require a but longer to toggle on however
+ OrionTheFox:
+ - bugfix: fixed the Icebox Phonebooth air alarm being on the outside, thus triggering
+ because the planet is, indeed, cold. It is now inside and all-access so that
+ callers can turn it off when they decide the phone's more important than their
+ health and safety.
+ SmArtKar:
+ - bugfix: Fixed atrocinator not yeeting you up
+ - bugfix: Fixed a qdel loop in hypnosis brain trauma
+ imedial:
+ - bugfix: Map vote now cares about current player count
+2024-12-07:
+ Ben10Omintrix:
+ - qol: u can now directly feed animals from ur hands, like raptors or cats, by clicking
+ on them with their preferred food.
+ - balance: u can now heal ur raptors mid or post battles by hand feeding them ores
+ FlufflesTheDog:
+ - spellcheck: paywall firing pins no longer set the gun description to the pin's
+ description on removal
+ LT3:
+ - bugfix: Tram spoilers correctly provide welder or multitool hints depending on
+ their damage
+ - bugfix: Malfunctioning tram controller flashes orange and can be preemptively
+ fixed before it crashes
+ SmArtKar:
+ - qol: AI laws and tape recorders no longer cause radio blips
+ - balance: Removed organ "refreshing" from legion cores, magic wands and regenerative
+ crossbreeds so they no longer get rid of your implants
+ - bugfix: Fixed an edge case with meteor moveloop code
+ - bugfix: Fixed projectile homing
+ - rscadd: Toolboxes can be used on any object to pull out and use a tool from it
+ as long as your offhand is free.
+ - qol: Jetpacks are significantly smoother and nicer to use now - and not affected
+ by lag anymore!
+ - code_imp: Cleaned up spacemove/jetpack code a bit and moved some common code to
+ helpers.
+ - refactor: Wings are now... jetpacks. They behave exactly the same and this should
+ reduce the amount of copypaste code in spacemove significantly.
+ SmArtKar, Kapu:
+ - code_imp: Implemented caching for icon sizes which should significantly improve
+ mob health performance due to HUDs constantly fetching icons
+ SyncIt21:
+ - code_imp: improved code for machinery
+ - code_imp: slightly improved code for borg inducer
+ - spellcheck: fixes examines & screentips for borg inducer
+ - code_imp: condensed code for reagent grinder
+ - bugfix: reagent grinder won't break when 2 or more people are simultaneously interacting
+ with it
+ - bugfix: ejecting contents & examining the reagent grinder as an AI via the radial
+ menu does not require it to be powered or anchored
+ - bugfix: examine block for reagent grinder as an AI is properly formatted
+ Time-Green:
+ - balance: Bioscramblers are no longer immortal
+ - balance: Anomalies give 20 extra seconds to defuse! Or 20 extra seconds for them
+ to reach havoc...
+ - balance: Material anomalies only teleport 1-4 times before detonating
+ carlarctg:
+ - bugfix: Recovered crew no longer show up on roundend report
+ - rscadd: Surgery trays now have a small chance to become medical toolboxes. Autopsy
+ trays can become coroner toolboxes.
+ - rscadd: Added a 1 in 1.000.000 chance for a toolbox to have four latches.
+ mc-oofert:
+ - balance: A mutation in gatfruit seeds has led to a drastic alteration in the observable
+ traits of the plant, which now fires hardened peas that deal less damage, but
+ poison the target. Additionally, its poison can be, with some botanical engineering,
+ replaced with whatever you wish.
+ - balance: burglars finesse spell range increased from 4 to 6 and it may loot any
+ back storage object, caretakers refuge cooldown is only applied when exiting
+ refuge, labyrinth handbook accepts any crayon instead of a white crayon
+ - qol: you may click an id with the knock heretic id card to make it consume it
+ - rscadd: janitor modsuit space cleaner mister module
+ - bugfix: manufacturing assembling machine crafts junk shells and lizard boots properly,
+ may no longer craft anchored objects (broken check), and sends its crafted stuff
+ at once
+ - balance: changeling last resort works as a monkey or animal
+ timothymtorres:
+ - bugfix: Fix drink labels for alcohol bottles
+ - rscadd: Add medical human organ crate emergency medical holodeck simulation
+ - bugfix: Fix gravity not updating for mobs when teleporting, wormhole jaunters,
+ wizard spells, tile creation/destruction, mech entry/ejection and other methods.
+ - bugfix: Fix gravity for areas in space near station (solars, nearspace, bomb testing,
+ etc.)
+ tontyGH:
+ - bugfix: runetext fades in correctly in bulk. signers rejoice
+ zxaber:
+ - bugfix: Mechs with crowbar-like tools can now hold adjacent firelocks open correctly.
+2024-12-08:
+ SyncIt21:
+ - refactor: improved attack chain code for rapid pipe dispenser
+ - code_imp: organized lists & global vars for rapid pipe dispenser into their own
+ respective files & improved a bunch of code
+2024-12-09:
+ FlufflesTheDog:
+ - bugfix: Dimensional shifter relics work more reliably.
+ Ghommie:
+ - bugfix: You should be once again able to fish moonfish and other fish used in
+ lizard cuisine from tiziran water turfs.
+ Melbert:
+ - rscdel: Some crowbars on Wawa, Nebula, and Birdboat are significantly less heavy
+ SmArtKar:
+ - image: Added unique sprites for Endotherm wintercoats
+ - image: Wintercoat hoods now show a bit of your hair!
+ grungussuss:
+ - rscadd: pointing now has interactions with the amount of limbs/organs you have
+ - balance: you can now point while restrained
+ - sound: pointing with your head makes a sound
+ grungussuss and Sothanforax:
+ - rscadd: hiss emote
+ - sound: hissssssing sounds
+ mc-oofert:
+ - bugfix: The Men in Grey may no longer access birdshots engineering via a certain
+ maintenance airlock
+ - bugfix: multitile airlock assemblies from a broken multitile airlock are the same
+ direction
+ mcbalaam:
+ - rscadd: Added the mail sorting unit - working with mail has never been simpler!
+ - rscadd: Added two flatpack pre-defined subtypes for the flatpacker and the mail
+ sorter.
+ timothymtorres:
+ - code_imp: Add better logging for ruins
+ tontyGH:
+ - bugfix: Pubby's whiteship no longer breaks when it tries to dock
+ - bugfix: /datum/component/PostTransfer() procs that didn't have their new_parent
+ arguments have now been fixed
+ - bugfix: This means that turning into a Domain gondola shouldn't RR people anymore
+2024-12-10:
+ MelokGleb:
+ - qol: changes Chronic Illness quirk name, description and icon to match it's dangerousness
+2024-12-11:
+ Ghommie:
+ - bugfix: Fixed feeding fish only increasing their size but not the weight.
+ - bugfix: Fixing remote/ghost alt-click functioning on aquariums
+ - bugfix: Added missing plasma tetra to freshwater fishing spots.
+ - balance: plasma tetra is now smaller and qualifies as baitfish.
+ LT3:
+ - bugfix: Map vote will no longer sometimes ignore the winning choice and pick a
+ cached, ineligible map
+ SmArtKar:
+ - bugfix: Removed rogue sand decals from Island Brawl domain walls
+ WebcomicArtist:
+ - bugfix: Durand shield now uses proper amount of power upon taking damage
+ - bugfix: Mech plasma generator now produces the correct amount of charge, previously
+ bugged to be 10% of intended.
+ carlarctg:
+ - rscadd: Adds suicides to fish. Like, a lot of suicides. Almost all of them very
+ unique. I'm too lazy to make a video, but they've been thoroughly tested.
+ grungussuss:
+ - bugfix: fixed *me emote being called when using the *help emote
+ - bugfix: you will no longer slip off your mount when traversing slippery surfaces
+ - bugfix: fixed being unable to remove bar seating holograms
+ - bugfix: fixed an error with slipping
+ - bugfix: fixed items not falling from a lattice after being deconstructed/destroyed
+2024-12-12:
+ Kocma-san:
+ - admin: moves all admin requests in admin stuff section. Now they have type Prayers
+ SmArtKar:
+ - bugfix: Made wendigo's bullet hell lag less, at cost of its visuals.
+ - bugfix: Toolboxes can now be placed onto tables/into crates
+ - bugfix: Fixed toolboxes automatically using the first item in them
+2024-12-13:
+ Majkl-J:
+ - bugfix: Fauna can no longer push necropolis gates
+ Melbert:
+ - bugfix: Words in other languages will be randomized far less often (depending
+ on how commonly they are used). This bug was 10 years old.
+ - qol: Hovering over clickable screen elements will now update your mouse cursor
+ to indicate they're clickable
+ - qol: Hovering over small wall mounts (light switches, buttons, fire alarms) will
+ now update to mouse cursor indicating you're hovering them
+ - qol: Cauterizing bleeding wounds now plays the cautery sfx.
+ - qol: Bleeding wounds will now go away the moment they're fully healed, rather
+ than a second or two later.
+ - qol: Suture / Mesh treatment is now uniform! meaning healing bruises with a suture
+ is now the same thing as healing cuts with a suture. This has very little difference
+ in practice, but it should generally result in a lot smoother experience.
+ - qol: 'Suture / Mesh usage has been reworked slightly, and now offers two modes
+ of use:'
+ - qol: LEFT CLICKING will heal in AUTO MODE, which will AUTOMATICALLY switch between
+ damaged bodyparts, prioritizing your targeted limb. You cannot change target
+ mid-heal; changing target simply changes your priority for your NEXT heal.
+ - qol: RIGHT CLICKING will heal in MANUAL MODE, which functions like it does currently
+ - allowing you to change your target before you finish your heal and giving
+ you a 1 second "assessment" step to change your target when you're done healing
+ a limb. Manual mode is 10% faster than Auto mode.
+ SmArtKar:
+ - image: Scarves have received a minor update to their sprites
+ - bugfix: Fixed moths only being able to fly if they spawn in zero gravity
+ grungussuss:
+ - bugfix: '*me emote works again'
+2024-12-14:
+ EnterTheJake:
+ - bugfix: temporary blocks such as blade heretic orbiting knives properly stop body
+ throws.
+ Ghommie:
+ - bugfix: Actually fixed alt-clicking aquariums.
+ Majkl-J:
+ - bugfix: Aloe cream no longer catches fire seconds after finishing baking
+ - bugfix: Overcharged SMESes no longer spam runtime when timers chug up
+ NecromancerAnne (code), orcacora (sprites):
+ - rscadd: Adds NT BR-38 Battle Rifles. A hybrid weapon. Find it in your local armory
+ and cargo catalogue today. (Keep away from EMPs)
+ Runi-c:
+ - balance: medical doctors can buy Reagent Dartgun from traitor uplink
+ SmArtKar:
+ - bugfix: Fixes primed stingbangs being invisible
+ SmArtKar, LemonInTheDark:
+ - rscadd: Changed how spraycans color items - "old" mode is still availible via
+ right click.
+ - refactor: Refactored how some items and effects color things so that they look
+ prettier.
+ SyncIt21:
+ - code_imp: improved code for leaning
+ distributivgesetz:
+ - code_imp: Fixed rare cases where moving an object somewhere could silently fail,
+ but still run unintended code. Report any weird issues on Github
+ grungussuss:
+ - bugfix: fixed regal rat attack logic
+ - bugfix: fixed access on birdshot engi mulebot delivery window
+ mcbalaam:
+ - qol: Now all antagonists are visible to an admin in the orbit menu!
+ norsvenska:
+ - spellcheck: The Lance and Raven shuttle airlocks are now properly labelled emergency
+ airlocks, rather than emegency airlocks.
+ - spellcheck: The radio jammer now releases disruptor waves, rather than distruptor
+ waves.
+ timothymtorres:
+ - sound: Add water sound to sinks
+2024-12-15:
+ Ghommie:
+ - bugfix: Fixed the displayed stats when examining fishing rods twice.
+ LT3:
+ - bugfix: Fixed unconstructed solar panels on Nebulastation port aft solars
+ Melbert:
+ - rscadd: Adds Syndol to the chemical kit, an addictive hallucinogen that applies
+ bonus effects when security officers, assistants, or clowns are exposed.
+ - bugfix: Metalgen works as a lockpick; igniting a crate metalgen'd into plasma
+ will properly drop its contents.
+ - code_imp: Hiding stuff in food should generally work more consistently now.
+ - bugfix: Fixes players not doing the "searching for item" do-after for items hidden
+ in food.
+ - qol: When dragging an item (like, with your mouse cursor. not physically), your
+ cursor updates when hovering humans or cyborgs to indicate you're hovering over
+ a human or cyborg.
+ Paxilmaniac:
+ - bugfix: Fixes resin sprayers not working if the target is more than one tile away
+ from you
+ necromanceranne:
+ - code_imp: Various mob attack procs are treated as unarmed attacks as a baseline
+ assumption, rather than melee attacks.
+ timothymtorres:
+ - code_imp: Improve looping sounds to allow nested and non-associative lists
diff --git a/icons/hud/radial.dmi b/icons/hud/radial.dmi
index f6e141ab6855a..5e32a89fe5d06 100644
Binary files a/icons/hud/radial.dmi and b/icons/hud/radial.dmi differ
diff --git a/icons/mob/clothing/back.dmi b/icons/mob/clothing/back.dmi
index a67830ac5e917..9fd317494ad8b 100644
Binary files a/icons/mob/clothing/back.dmi and b/icons/mob/clothing/back.dmi differ
diff --git a/icons/mob/clothing/belt_mirror.dmi b/icons/mob/clothing/belt_mirror.dmi
index 95f7bc00ae9d0..0ffdb70219cf4 100644
Binary files a/icons/mob/clothing/belt_mirror.dmi and b/icons/mob/clothing/belt_mirror.dmi differ
diff --git a/icons/mob/clothing/head/winterhood.dmi b/icons/mob/clothing/head/winterhood.dmi
index ba722a5a0f281..a173364c99454 100644
Binary files a/icons/mob/clothing/head/winterhood.dmi and b/icons/mob/clothing/head/winterhood.dmi differ
diff --git a/icons/mob/clothing/neck.dmi b/icons/mob/clothing/neck.dmi
index bd57cb6eee916..cb02e72603bbe 100644
Binary files a/icons/mob/clothing/neck.dmi and b/icons/mob/clothing/neck.dmi differ
diff --git a/icons/mob/clothing/suits/wintercoat.dmi b/icons/mob/clothing/suits/wintercoat.dmi
index 9bcfca4d6a3a1..921e3991846ff 100644
Binary files a/icons/mob/clothing/suits/wintercoat.dmi and b/icons/mob/clothing/suits/wintercoat.dmi differ
diff --git a/icons/mob/human/hair_masks.dmi b/icons/mob/human/hair_masks.dmi
index 5dbd4917a87e3..bb7b55e0cc3a4 100644
Binary files a/icons/mob/human/hair_masks.dmi and b/icons/mob/human/hair_masks.dmi differ
diff --git a/icons/mob/human/textures.dmi b/icons/mob/human/textures.dmi
index 4408c3e067281..78bf3a18e10dc 100644
Binary files a/icons/mob/human/textures.dmi and b/icons/mob/human/textures.dmi differ
diff --git a/icons/mob/inhands/equipment/toolbox_lefthand.dmi b/icons/mob/inhands/equipment/toolbox_lefthand.dmi
index e3aca82d9e839..3dbd5ea013d42 100644
Binary files a/icons/mob/inhands/equipment/toolbox_lefthand.dmi and b/icons/mob/inhands/equipment/toolbox_lefthand.dmi differ
diff --git a/icons/mob/inhands/equipment/toolbox_righthand.dmi b/icons/mob/inhands/equipment/toolbox_righthand.dmi
index a7b538a130002..13dc226fcea31 100644
Binary files a/icons/mob/inhands/equipment/toolbox_righthand.dmi and b/icons/mob/inhands/equipment/toolbox_righthand.dmi differ
diff --git a/icons/mob/inhands/weapons/guns_lefthand.dmi b/icons/mob/inhands/weapons/guns_lefthand.dmi
index 90df2a892f984..369365131c6de 100644
Binary files a/icons/mob/inhands/weapons/guns_lefthand.dmi and b/icons/mob/inhands/weapons/guns_lefthand.dmi differ
diff --git a/icons/mob/inhands/weapons/guns_righthand.dmi b/icons/mob/inhands/weapons/guns_righthand.dmi
index eebed61656aa4..fb77baa515b08 100644
Binary files a/icons/mob/inhands/weapons/guns_righthand.dmi and b/icons/mob/inhands/weapons/guns_righthand.dmi differ
diff --git a/icons/obj/clothing/head/winterhood.dmi b/icons/obj/clothing/head/winterhood.dmi
index 34e0abf39beef..591f99ec313fb 100644
Binary files a/icons/obj/clothing/head/winterhood.dmi and b/icons/obj/clothing/head/winterhood.dmi differ
diff --git a/icons/obj/clothing/neck.dmi b/icons/obj/clothing/neck.dmi
index ca90eb8a3291b..3a1bd3d2ccff3 100644
Binary files a/icons/obj/clothing/neck.dmi and b/icons/obj/clothing/neck.dmi differ
diff --git a/icons/obj/clothing/suits/wintercoat.dmi b/icons/obj/clothing/suits/wintercoat.dmi
index 377c9ef61e30e..a70b4eb6cbe98 100644
Binary files a/icons/obj/clothing/suits/wintercoat.dmi and b/icons/obj/clothing/suits/wintercoat.dmi differ
diff --git a/icons/obj/machines/engine/turbine.dmi b/icons/obj/machines/engine/turbine.dmi
index 1ae45eb2a1b1f..afd9839af1341 100644
Binary files a/icons/obj/machines/engine/turbine.dmi and b/icons/obj/machines/engine/turbine.dmi differ
diff --git a/icons/obj/machines/mailsorter.dmi b/icons/obj/machines/mailsorter.dmi
new file mode 100644
index 0000000000000..8d09e36796f95
Binary files /dev/null and b/icons/obj/machines/mailsorter.dmi differ
diff --git a/icons/obj/machines/vending.dmi b/icons/obj/machines/vending.dmi
index 319771e4e7fb5..8c39296a155f7 100644
Binary files a/icons/obj/machines/vending.dmi and b/icons/obj/machines/vending.dmi differ
diff --git a/icons/obj/storage/toolbox.dmi b/icons/obj/storage/toolbox.dmi
index 9ca99565f3174..49385d5b73cf2 100644
Binary files a/icons/obj/storage/toolbox.dmi and b/icons/obj/storage/toolbox.dmi differ
diff --git a/icons/obj/weapons/grenade.dmi b/icons/obj/weapons/grenade.dmi
index c65f6d0e9fb80..628b271d423e5 100644
Binary files a/icons/obj/weapons/grenade.dmi and b/icons/obj/weapons/grenade.dmi differ
diff --git a/icons/obj/weapons/guns/ammo.dmi b/icons/obj/weapons/guns/ammo.dmi
index 2dab0cb3d8d08..0f3b0620198ee 100644
Binary files a/icons/obj/weapons/guns/ammo.dmi and b/icons/obj/weapons/guns/ammo.dmi differ
diff --git a/icons/obj/weapons/guns/ballistic.dmi b/icons/obj/weapons/guns/ballistic.dmi
index ef61f1d24949d..6f208f4d8b1cd 100644
Binary files a/icons/obj/weapons/guns/ballistic.dmi and b/icons/obj/weapons/guns/ballistic.dmi differ
diff --git a/icons/obj/weapons/guns/projectiles.dmi b/icons/obj/weapons/guns/projectiles.dmi
index d3ecd385a7094..2776fbd4961a8 100644
Binary files a/icons/obj/weapons/guns/projectiles.dmi and b/icons/obj/weapons/guns/projectiles.dmi differ
diff --git a/icons/obj/weapons/guns/wide_guns.dmi b/icons/obj/weapons/guns/wide_guns.dmi
index 7e18f60eeb864..a193dcc53015f 100644
Binary files a/icons/obj/weapons/guns/wide_guns.dmi and b/icons/obj/weapons/guns/wide_guns.dmi differ
diff --git a/icons/turf/floors.dmi b/icons/turf/floors.dmi
index ff9d1e62e9b31..3b67fc7927e51 100644
Binary files a/icons/turf/floors.dmi and b/icons/turf/floors.dmi differ
diff --git a/modular_doppler/damage_control/code/breach_gear.dm b/modular_doppler/damage_control/code/breach_gear.dm
new file mode 100644
index 0000000000000..c8666c9913ea9
--- /dev/null
+++ b/modular_doppler/damage_control/code/breach_gear.dm
@@ -0,0 +1,200 @@
+// Yellow tank but empty, for the printer
+
+/obj/item/tank/internals/oxygen/yellow/empty
+
+/obj/item/tank/internals/oxygen/yellow/empty/populate_gas()
+ return
+
+// Breach helmet, its a hardhat but cooler
+
+/obj/item/clothing/head/utility/hardhat/welding/doppler_dc
+ name = "breach helmet"
+ desc = "A heavy-duty hardhat with a pressure seal and fireproofing for when things go very wrong. \
+ The headlamp is red to preserve eyesight in dark, damaged environments."
+ icon = 'modular_doppler/damage_control/icons/gear.dmi'
+ icon_state = "hardhat0_dc"
+ hat_type = "dc"
+ worn_icon = 'modular_doppler/damage_control/icons/mob/gear.dmi'
+ mask_overlay_icon = 'modular_doppler/damage_control/icons/mob/gear.dmi'
+ dog_fashion = null
+
+ resistance_flags = FIRE_PROOF
+ clothing_flags = STOPSPRESSUREDAMAGE | STACKABLE_HELMET_EXEMPT
+ heat_protection = HEAD
+ max_heat_protection_temperature = FIRE_HELM_MAX_TEMP_PROTECT
+ cold_protection = HEAD
+ min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT
+ light_range = 4
+ light_color = "#ee243d"
+
+/obj/item/clothing/head/utility/hardhat/welding/doppler_dc/worn_overlays(mutable_appearance/standing, isinhands, icon_file)
+ . = ..()
+ if(!isinhands)
+ . += emissive_appearance(icon_file, "hardhat_dc_emissive", src, alpha = src.alpha)
+
+// Reflective fire jacket, like the shiny type super serious firefighters have to use
+
+/obj/item/clothing/suit/utility/fire/doppler
+ name = "reflective firecoat"
+ desc = "A bulky firesuit clad in reflective material to deflect heat away from the wearer."
+ icon = 'modular_doppler/damage_control/icons/gear.dmi'
+ icon_state = "firecoat"
+ worn_icon = 'modular_doppler/damage_control/icons/mob/gear.dmi'
+ inhand_icon_state = "taperobe"
+ w_class = WEIGHT_CLASS_BULKY
+ slowdown = 0.75
+ flags_inv = NONE
+
+// Skinsuit, tight fitting jumpsuit that keeps you from exploding thanks to pressure damage
+
+/obj/item/clothing/under/rank/engineering/breach_skinsuit
+ name = "breach skinsuit"
+ desc = "A special jumpsuit that, when properly worn and adjusted, fits extremely tightly around the wearer's body. \
+ This is uncomfortable and slow to move in, but protects the wearer from exposure to vacuum."
+ icon = 'modular_doppler/damage_control/icons/gear.dmi'
+ icon_state = "skinsuit"
+ worn_icon = 'modular_doppler/damage_control/icons/mob/gear.dmi'
+ equip_sound = 'sound/items/equip/glove_equip.ogg'
+ can_adjust = FALSE
+ resistance_flags = FIRE_PROOF
+ clothing_flags = STOPSPRESSUREDAMAGE
+ cold_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
+ min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
+ slowdown = 0.5
+
+/obj/item/clothing/under/rank/engineering/breach_skinsuit/worn_overlays(mutable_appearance/standing, isinhands, icon_file)
+ . = ..()
+ if(!isinhands)
+ . += emissive_appearance(icon_file, "[icon_state]-emissive", src, alpha = src.alpha)
+
+// Gas masks but they aren't flammable (its an atmos gas mask without the extra filters)
+
+/obj/item/clothing/mask/gas/breach
+ name = "gas mask"
+ desc = "A fireproofed gas mask with a special layer on the faceplate that prevents being blinded by fire reflash. \
+ Will not protect you from more intense lighting than that, however."
+ icon = 'modular_doppler/damage_control/icons/gear.dmi'
+ icon_state = "mask"
+ worn_icon = 'modular_doppler/damage_control/icons/mob/gear.dmi'
+ worn_icon_state = "mask"
+ supported_bodyshapes = list(BODYSHAPE_HUMANOID)
+ bodyshape_icon_files = list(
+ BODYSHAPE_HUMANOID_T = 'modular_doppler/damage_control/icons/mob/gear.dmi',
+ )
+ armor_type = /datum/armor/gas_atmos
+ resistance_flags = FIRE_PROOF
+
+// Bag for storing the breach ensemble without cluttering fire lockers too bad
+
+/obj/item/storage/bag/breach_bag
+ name = "damage control ensemble bag"
+ desc = "A fire and chemical proofed bag for storing breach gear when not in use. \
+ A small label states that the bags should be inspected for contents every six months, \
+ though the last inspection signature looks much older than that."
+ icon = 'modular_doppler/damage_control/icons/gear.dmi'
+ icon_state = "breach_bag"
+ slot_flags = NONE
+ resistance_flags = FIRE_PROOF | ACID_PROOF
+
+/obj/item/storage/bag/breach_bag/Initialize(mapload)
+ . = ..()
+ atom_storage.max_specific_storage = WEIGHT_CLASS_BULKY
+ atom_storage.numerical_stacking = FALSE
+ atom_storage.max_total_storage = 200
+ atom_storage.max_slots = 6
+ atom_storage.insert_preposition = "in"
+ atom_storage.set_holdable(list(
+ /obj/item/clothing/head/utility,
+ /obj/item/clothing/suit/utility,
+ /obj/item/clothing/under/rank/engineering,
+ /obj/item/clothing/mask/gas,
+ /obj/item/clothing/shoes,
+ /obj/item/clothing/gloves,
+ ))
+
+/obj/item/storage/bag/breach_bag/PopulateContents()
+ new /obj/item/clothing/head/utility/hardhat/welding/doppler_dc(src)
+ new /obj/item/clothing/suit/utility/fire/doppler(src)
+ new /obj/item/clothing/under/rank/engineering/breach_skinsuit(src)
+ new /obj/item/clothing/mask/gas/breach(src)
+ new /obj/item/clothing/shoes/jackboots/frontier_colonist(src)
+ new /obj/item/clothing/gloves/frontier_colonist(src)
+
+// Metal H2 axe if you ever actually saw one once in 200 rounds
+
+/obj/item/fireaxe/metal_h2_axe/emergency_extraction
+ name = "emergency extraction axe"
+
+// Edits to fire lockers to include the new breach kit
+
+/obj/structure/closet/firecloset/PopulateContents()
+ new /obj/item/storage/bag/breach_bag(src)
+ new /obj/item/storage/bag/breach_bag(src)
+ new /obj/item/tank/internals/oxygen/yellow(src)
+ new /obj/item/tank/internals/oxygen/yellow(src)
+ new /obj/item/extinguisher(src)
+ new /obj/item/crowbar/large/emergency(src)
+ new /obj/item/emergency_bed(src)
+
+ if(prob(30))
+ new /obj/item/flatpacked_machine/damage_lathe(src)
+
+/obj/structure/closet/firecloset/full/PopulateContents()
+ new /obj/item/storage/bag/breach_bag(src)
+ new /obj/item/storage/bag/breach_bag(src)
+ new /obj/item/tank/internals/oxygen/yellow(src)
+ new /obj/item/tank/internals/oxygen/yellow(src)
+ new /obj/item/extinguisher(src)
+ new /obj/item/crowbar/large/emergency(src)
+ new /obj/item/emergency_bed(src)
+ new /obj/item/door_seal(src)
+ new /obj/item/door_seal(src)
+ new /obj/item/door_seal(src)
+ new /obj/item/stack/sheet/iron/ten(src)
+
+ if(prob(50))
+ new /obj/item/flatpacked_machine/damage_lathe(src)
+
+// Emergency closets get a little lovin too
+
+/obj/structure/closet/emcloset/PopulateContents()
+ var/list/possible_spawn_pools = list(
+ "air_only" = 3,
+ "stretcher" = 2,
+ "mixture" = 3,
+ "get_out_while_you_still_can" = 2,
+ )
+
+ new /obj/item/storage/toolbox/emergency(src)
+
+ switch (pick_weight(possible_spawn_pools))
+ if ("air_only")
+ new /obj/item/tank/internals/emergency_oxygen(src)
+ new /obj/item/tank/internals/emergency_oxygen(src)
+ new /obj/item/tank/internals/emergency_oxygen(src)
+ new /obj/item/clothing/mask/gas/breach(src)
+ new /obj/item/clothing/mask/gas/breach(src)
+ new /obj/item/clothing/mask/gas/breach(src)
+ if ("stretcher")
+ new /obj/item/clothing/head/utility/hardhat/welding/doppler_dc(src)
+ new /obj/item/clothing/head/utility/hardhat/welding/doppler_dc(src)
+ new /obj/item/storage/backpack/duffelbag/deforest_medkit/stocked(src)
+ new /obj/item/emergency_bed(src)
+ if ("mixture")
+ new /obj/item/clothing/head/utility/hardhat/welding/doppler_dc(src)
+ new /obj/item/clothing/head/utility/hardhat/welding/doppler_dc(src)
+ new /obj/item/tank/internals/emergency_oxygen(src)
+ new /obj/item/tank/internals/emergency_oxygen(src)
+ new /obj/item/clothing/mask/gas/breach(src)
+ new /obj/item/clothing/mask/gas/breach(src)
+ new /obj/item/storage/medkit/emergency(src)
+ new /obj/item/emergency_bed(src)
+ if ("get_out_while_you_still_can")
+ new /obj/item/clothing/head/utility/hardhat/welding/doppler_dc(src)
+ new /obj/item/clothing/head/utility/hardhat/welding/doppler_dc(src)
+ new /obj/item/tank/internals/emergency_oxygen(src)
+ new /obj/item/tank/internals/emergency_oxygen(src)
+ new /obj/item/clothing/mask/gas/breach(src)
+ new /obj/item/clothing/mask/gas/breach(src)
+ new /obj/item/emergency_bed(src)
+ new /obj/item/fireaxe/metal_h2_axe/emergency_extraction(src)
diff --git a/modular_doppler/damage_control/code/emergency_fab.dm b/modular_doppler/damage_control/code/emergency_fab.dm
new file mode 100644
index 0000000000000..b831e3b6018f5
--- /dev/null
+++ b/modular_doppler/damage_control/code/emergency_fab.dm
@@ -0,0 +1,83 @@
+/obj/machinery/rnd/production/damage_control_fab
+ name = "emergency repair lathe"
+ desc = "A small little machine with no material insertion ports and no power connectors. \
+ Able to use the small trickle of power an internal source creates to slowly create \
+ essential damage control equipment."
+ icon = 'modular_doppler/damage_control/icons/machines.dmi'
+ icon_state = "damage_fab"
+ base_icon_state = "damage_fab"
+ circuit = null
+ production_animation = "damage_fab_working"
+ light_color = LIGHT_COLOR_INTENSE_RED
+ light_power = 5
+ allowed_buildtypes = DAMAGE_FAB
+ use_power = FALSE
+ /// The item we turn into when repacked
+ var/repacked_type = /obj/item/flatpacked_machine/damage_lathe
+
+/obj/machinery/rnd/production/damage_control_fab/Initialize(mapload)
+ . = ..()
+ AddElement(/datum/element/repackable, repacked_type, 5 SECONDS)
+ stored_research = locate(/datum/techweb/admin) in SSresearch.techwebs
+ if(!mapload)
+ flick("damage_fab_deploy", src)
+
+// formerly NO_DECONSTRUCTION
+/obj/machinery/rnd/production/damage_control_fab/default_deconstruction_screwdriver(mob/user, icon_state_open, icon_state_closed, obj/item/screwdriver)
+ return NONE
+
+/obj/machinery/rnd/production/damage_control_fab/default_deconstruction_crowbar(obj/item/crowbar, ignore_panel, custom_deconstruct)
+ return NONE
+
+/obj/machinery/rnd/production/damage_control_fab/default_pry_open(obj/item/crowbar, close_after_pry, open_density, closed_density)
+ return NONE
+
+/obj/machinery/rnd/production/damage_control_fab/start_printing_visuals()
+ set_light(l_range = 1.5)
+ icon_state = "colony_lathe_working"
+ update_appearance()
+
+/obj/machinery/rnd/production/damage_control_fab/finalize_build()
+ . = ..()
+ set_light(l_range = 0)
+ icon_state = base_icon_state
+ update_appearance()
+ flick("colony_lathe_finish_print", src)
+
+/obj/machinery/rnd/production/damage_control_fab/build_efficiency()
+ return 1
+
+// We take from all nodes even unresearched ones
+/obj/machinery/rnd/production/damage_control_fab/update_designs()
+ var/previous_design_count = cached_designs.len
+
+ cached_designs.Cut()
+
+ for(var/design_id in SSresearch.techweb_designs)
+ var/datum/design/design = SSresearch.techweb_designs[design_id]
+
+ if((isnull(allowed_department_flags) || (design.departmental_flags & allowed_department_flags)) && (design.build_type & allowed_buildtypes))
+ cached_designs |= design
+
+ var/design_delta = cached_designs.len - previous_design_count
+
+ if(design_delta > 0)
+ say("Received [design_delta] new design[design_delta == 1 ? "" : "s"].")
+ playsound(src, 'sound/machines/beep/twobeep_high.ogg', 50, TRUE)
+
+ update_static_data_for_all_viewers()
+
+// Item for carrying the lathe around and building it
+
+/obj/item/flatpacked_machine/damage_lathe
+ name = "packed emergency repair lathe"
+ /// For all flatpacked machines, set the desc to the type_to_deploy followed by ::desc to reuse the type_to_deploy's description
+ desc = /obj/machinery/rnd/production/damage_control_fab::desc
+ icon = 'modular_doppler/damage_control/icons/packed_machines.dmi'
+ icon_state = "damage_lathe_packed"
+ w_class = WEIGHT_CLASS_BULKY
+ type_to_deploy = /obj/machinery/rnd/production/damage_control_fab
+ deploy_time = 4 SECONDS
+
+/obj/item/flatpacked_machine/damage_lathe/give_manufacturer_examine()
+ return
diff --git a/modular_doppler/damage_control/code/emergency_fab_designs.dm b/modular_doppler/damage_control/code/emergency_fab_designs.dm
new file mode 100644
index 0000000000000..c06d0e8fb7a51
--- /dev/null
+++ b/modular_doppler/damage_control/code/emergency_fab_designs.dm
@@ -0,0 +1,231 @@
+/datum/techweb_node/emergency_fab_designs
+ id = TECHWEB_NODE_EMERGENCY_FAB
+ display_name = "Emergency Repair Lathe Designs"
+ description = "All of the designs that work for the emergency repair lathe."
+ design_ids = list(
+ "breach_bag_doppla",
+ "breach_helmet_doppla",
+ "empty_yellow_tank_doppla",
+ "door_seal_doppla",
+ "damage_fab_plastic_wall_panel",
+ "damage_fab_medbed",
+ "damage_fab_crowbar",
+ "damage_fab_welder",
+ "damage_fab_flare",
+ "damage_fab_foam",
+ "damage_fab_oxcandle",
+ "damage_fab_radio",
+ "damage_fab_battery",
+ )
+ research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 50000000000000) // God save you
+ hidden = TRUE
+ show_on_wiki = FALSE
+ starting_node = TRUE
+
+// Breach helmet
+
+/datum/design/breach_helmet_doppla
+ name = "Breach Helmet"
+ id = "breach_helmet_doppla"
+ build_type = DAMAGE_FAB
+ build_path = /obj/item/storage/bag/breach_bag
+ construction_time = 2 MINUTES
+ materials = list(
+ /datum/material/iron = SMALL_MATERIAL_AMOUNT,
+ )
+ category = list(
+ RND_CATEGORY_INITIAL,
+ RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_ATMOSPHERICS,
+ )
+
+// Entire filled breach bag
+
+/datum/design/breach_bag_doppla
+ name = "Damage Control Ensemble Bag"
+ id = "breach_bag_doppla"
+ build_type = DAMAGE_FAB
+ build_path = /obj/item/clothing/head/utility/hardhat/welding/doppler_dc
+ construction_time = 7 MINUTES
+ materials = list(
+ /datum/material/iron = SMALL_MATERIAL_AMOUNT,
+ )
+ category = list(
+ RND_CATEGORY_INITIAL,
+ RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_ATMOSPHERICS,
+ )
+
+// Entire filled breach bag
+
+/datum/design/empty_yellow_tank_doppla
+ name = "Emergency Internals Tank"
+ id = "empty_yellow_tank_doppla"
+ build_type = DAMAGE_FAB
+ build_path = /obj/item/tank/internals/emergency_oxygen/engi
+ construction_time = 1 MINUTES
+ materials = list(
+ /datum/material/iron = SMALL_MATERIAL_AMOUNT,
+ )
+ category = list(
+ RND_CATEGORY_INITIAL,
+ RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_ATMOSPHERICS,
+ )
+
+// Door seals
+
+/datum/design/door_seal_doppla
+ name = "Door Seal"
+ id = "door_seal_doppla"
+ build_type = DAMAGE_FAB
+ build_path = /obj/item/door_seal
+ construction_time = 2 MINUTES
+ materials = list(
+ /datum/material/iron = SMALL_MATERIAL_AMOUNT,
+ )
+ category = list(
+ RND_CATEGORY_INITIAL,
+ RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_ENGINEERING,
+ )
+
+// Plastic wall panels are good for sealing holes in the wall
+
+/datum/design/damage_fab_plastic_wall
+ name = "Plastic Paneling"
+ id = "damage_fab_plastic_wall_panel"
+ build_type = DAMAGE_FAB
+ materials = list(
+ /datum/material/iron = SMALL_MATERIAL_AMOUNT,
+ )
+ build_path = /obj/item/stack/sheet/plastic_wall_panel
+ category = list(
+ RND_CATEGORY_INITIAL,
+ RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_ENGINEERING,
+ )
+ construction_time = 10 SECONDS
+
+// Rollerbeds for saving people
+
+/datum/design/damage_fab_rollerbed
+ name = "Emergency Medical Bed"
+ id = "damage_fab_medbed"
+ build_type = DAMAGE_FAB
+ materials = list(
+ /datum/material/iron = SMALL_MATERIAL_AMOUNT,
+ )
+ build_path = /obj/item/emergency_bed
+ category = list(
+ RND_CATEGORY_INITIAL,
+ RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_MEDICAL,
+ )
+ construction_time = 1 MINUTES
+
+// Bar with crows in it
+
+/datum/design/damage_fab_crowbar
+ name = "Emergency Crowbar"
+ id = "damage_fab_crowbar"
+ build_type = DAMAGE_FAB
+ materials = list(
+ /datum/material/iron = SMALL_MATERIAL_AMOUNT,
+ )
+ build_path = /obj/item/crowbar/red
+ category = list(
+ RND_CATEGORY_INITIAL,
+ RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_ENGINEERING,
+ )
+ construction_time = 1 MINUTES
+
+// Bar with crows in it
+
+/datum/design/damage_fab_emergency_welder
+ name = "Emergency Welding Tool"
+ id = "damage_fab_welder"
+ build_type = DAMAGE_FAB
+ materials = list(
+ /datum/material/iron = SMALL_MATERIAL_AMOUNT,
+ )
+ build_path = /obj/item/weldingtool/mini
+ category = list(
+ RND_CATEGORY_INITIAL,
+ RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_ENGINEERING,
+ )
+ construction_time = 1 MINUTES
+
+// Flare
+
+/datum/design/damage_fab_flare
+ name = "Flare"
+ id = "damage_fab_flare"
+ build_type = DAMAGE_FAB
+ materials = list(
+ /datum/material/iron = SMALL_MATERIAL_AMOUNT,
+ )
+ build_path = /obj/item/flashlight/flare
+ category = list(
+ RND_CATEGORY_INITIAL,
+ RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_ENGINEERING,
+ )
+ construction_time = 30 SECONDS
+
+// Budget metal foam grenade
+
+/datum/design/damage_fab_foam
+ name = "Foam Grenade"
+ id = "damage_fab_foam"
+ build_type = DAMAGE_FAB
+ materials = list(
+ /datum/material/iron = SMALL_MATERIAL_AMOUNT,
+ )
+ build_path = /obj/item/grenade/chem_grenade/budget_smart_metal
+ category = list(
+ RND_CATEGORY_INITIAL,
+ RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_ENGINEERING,
+ )
+ construction_time = 2 MINUTES
+
+// Oxygen candle
+
+/datum/design/damage_fab_oxygencandle
+ name = "Oxygen Candle"
+ id = "damage_fab_oxcandle"
+ build_type = DAMAGE_FAB
+ materials = list(
+ /datum/material/iron = SMALL_MATERIAL_AMOUNT,
+ )
+ build_path = /obj/item/oxygen_candle
+ category = list(
+ RND_CATEGORY_INITIAL,
+ RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_ATMOSPHERICS,
+ )
+ construction_time = 2 MINUTES
+
+// Handheld radio
+
+/datum/design/damage_fab_radio
+ name = "Handheld Radio"
+ id = "damage_fab_radio"
+ build_type = DAMAGE_FAB
+ materials = list(
+ /datum/material/iron = SMALL_MATERIAL_AMOUNT,
+ )
+ build_path = /obj/item/radio/off
+ category = list(
+ RND_CATEGORY_INITIAL,
+ RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_TELECOMMS,
+ )
+ construction_time = 1 MINUTES
+
+// AA Battery
+
+/datum/design/damage_fab_battery
+ name = "AA Battery"
+ id = "damage_fab_battery"
+ build_type = DAMAGE_FAB
+ materials = list(
+ /datum/material/iron = SMALL_MATERIAL_AMOUNT,
+ )
+ build_path = /obj/item/stock_parts/power_store/cell/crap
+ category = list(
+ RND_CATEGORY_INITIAL,
+ RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_ENGINEERING,
+ )
+ construction_time = 1 MINUTES
diff --git a/modular_doppler/damage_control/icons/gear.dmi b/modular_doppler/damage_control/icons/gear.dmi
new file mode 100644
index 0000000000000..83aca04bf0e4f
Binary files /dev/null and b/modular_doppler/damage_control/icons/gear.dmi differ
diff --git a/modular_doppler/damage_control/icons/machines.dmi b/modular_doppler/damage_control/icons/machines.dmi
new file mode 100644
index 0000000000000..1249748fd156f
Binary files /dev/null and b/modular_doppler/damage_control/icons/machines.dmi differ
diff --git a/modular_doppler/damage_control/icons/mob/gear.dmi b/modular_doppler/damage_control/icons/mob/gear.dmi
new file mode 100644
index 0000000000000..9a26c23d4d788
Binary files /dev/null and b/modular_doppler/damage_control/icons/mob/gear.dmi differ
diff --git a/modular_doppler/damage_control/icons/packed_machines.dmi b/modular_doppler/damage_control/icons/packed_machines.dmi
new file mode 100644
index 0000000000000..caf5689163173
Binary files /dev/null and b/modular_doppler/damage_control/icons/packed_machines.dmi differ
diff --git a/modular_doppler/deforest_medical_items/code/cargo_packs.dm b/modular_doppler/deforest_medical_items/code/cargo_packs.dm
index 5dced06ad9d9e..5904f201097f5 100644
--- a/modular_doppler/deforest_medical_items/code/cargo_packs.dm
+++ b/modular_doppler/deforest_medical_items/code/cargo_packs.dm
@@ -29,34 +29,15 @@
/obj/item/storage/medkit/combat_surgeon/stocked = 3,
)
-/datum/supply_pack/medical/kit_technician
- name = "Heavy Duty Medical Kit Crate - Technician"
- crate_name = "technician kit crate"
- desc = "Contains a pink medical technician kit."
- access = ACCESS_MEDICAL
- cost = CARGO_CRATE_VALUE * 5.5
- contains = list(
- /obj/item/storage/backpack/duffelbag/deforest_paramedic/stocked,
- )
-
-/datum/supply_pack/medical/kit_surgical
- name = "Heavy Duty Medical Kit Crate - Surgical"
- crate_name = "surgical kit crate"
- desc = "Contains a grey first responder surgical kit."
- access = ACCESS_MEDICAL
- cost = CARGO_CRATE_VALUE * 5
- contains = list(
- /obj/item/storage/backpack/duffelbag/deforest_surgical/stocked,
- )
-
/datum/supply_pack/medical/kit_medical
- name = "Heavy Duty Medical Kit Crate - Medical"
+ name = "Heavy Duty Medical Kit Crate"
crate_name = "medical kit crate"
- desc = "Contains an orange satchel medical kit."
+ desc = "Contains two heavy-duty medical kits for emergencies."
access = ACCESS_MEDICAL
- cost = CARGO_CRATE_VALUE * 4.5
+ cost = CARGO_CRATE_VALUE * 11
contains = list(
/obj/item/storage/backpack/duffelbag/deforest_medkit/stocked,
+ /obj/item/storage/backpack/duffelbag/deforest_surgical/stocked,
)
/datum/supply_pack/medical/deforest_vendor_refill
diff --git a/modular_doppler/deforest_medical_items/code/healing_stack_items.dm b/modular_doppler/deforest_medical_items/code/healing_stack_items.dm
index 245ba6699f93a..9c8cf1f35ca58 100644
--- a/modular_doppler/deforest_medical_items/code/healing_stack_items.dm
+++ b/modular_doppler/deforest_medical_items/code/healing_stack_items.dm
@@ -33,7 +33,7 @@
var/treatment_sound = 'sound/items/duct_tape/duct_tape_rip.ogg'
// This is only relevant for the types of wounds defined, we can't work if there are none
-/obj/item/stack/medical/wound_recovery/try_heal(mob/living/patient, mob/user, silent, looping)
+/obj/item/stack/medical/wound_recovery/try_heal(mob/living/patient, mob/user, silent, looping, auto_change_zone = FALSE)
if(patient.has_status_effect(/datum/status_effect/vulnerable_to_damage))
patient.balloon_alert(user, "still recovering from last use!")
diff --git a/modular_doppler/deforest_medical_items/code/illegal_injectors.dm b/modular_doppler/deforest_medical_items/code/illegal_injectors.dm
index 7c3059f5d976e..59b91db488b64 100644
--- a/modular_doppler/deforest_medical_items/code/illegal_injectors.dm
+++ b/modular_doppler/deforest_medical_items/code/illegal_injectors.dm
@@ -1,18 +1,3 @@
-// Twitch, because having sandevistans be implants is for losers, just inject it!
-/obj/item/reagent_containers/hypospray/medipen/deforest/twitch
- name = "TWitch sensory stimulant injector"
- desc = "A Deforest branded autoinjector, loaded with 'TWitch' among other reagents. This drug is known to make \
- those who take it 'see faster', whatever that means."
- base_icon_state = "twitch"
- icon_state = "twitch"
- list_reagents = list(
- /datum/reagent/drug/twitch = 10,
- /datum/reagent/drug/maint/tar = 5,
- /datum/reagent/medicine/silibinin = 5,
- /datum/reagent/toxin/leadacetate = 5,
- )
- custom_price = PAYCHECK_COMMAND * 3.5
-
// Demoneye, for when you feel the need to become "fucking invincible"
/obj/item/reagent_containers/hypospray/medipen/deforest/demoneye
name = "DemonEye steroid injector"
@@ -54,10 +39,11 @@
/datum/reagent/medicine/c2/penthrite = 5,
/datum/reagent/medicine/polypyr = 5,
/datum/reagent/medicine/silibinin = 5,
- /datum/reagent/medicine/omnizine = 5,
+ /datum/reagent/medicine/omnizine = 10,
/datum/reagent/inverse/healing/tirimol = 5,
)
custom_price = PAYCHECK_COMMAND * 2.5
+ volume = 30
// Combat stimulant that makes you immune to slowdowns for a bit
/obj/item/reagent_containers/hypospray/medipen/deforest/synalvipitol
diff --git a/modular_doppler/deforest_medical_items/code/injectors.dm b/modular_doppler/deforest_medical_items/code/injectors.dm
index 02558b52bb102..27ab2969f9d45 100644
--- a/modular_doppler/deforest_medical_items/code/injectors.dm
+++ b/modular_doppler/deforest_medical_items/code/injectors.dm
@@ -77,7 +77,7 @@
/datum/reagent/medicine/synaptizine = 5,
/datum/reagent/medicine/inaprovaline = 5,
/datum/reagent/determination = 10,
- /datum/reagent/toxin/histamine = 5,
+ /datum/reagent/toxin/lipolicide = 5,
)
// Morpital, heals a small amount of damage and kills pain for a bit
@@ -87,9 +87,9 @@
base_icon_state = "morpital"
icon_state = "morpital"
list_reagents = list(
- /datum/reagent/medicine/morphine = 5,
- /datum/reagent/medicine/omnizine/protozine = 15,
- /datum/reagent/toxin/staminatoxin = 5,
+ /datum/reagent/medicine/mine_salve = 5,
+ /datum/reagent/medicine/omnizine = 15,
+ /datum/reagent/toxin/lipolicide = 5,
)
// Lipital, heals more damage than morpital but doesnt work much at higher damages
@@ -102,7 +102,7 @@
list_reagents = list(
/datum/reagent/medicine/lidocaine = 5,
/datum/reagent/medicine/omnizine = 5,
- /datum/reagent/medicine/c2/probital = 10,
+ /datum/reagent/medicine/c2/libital = 10,
)
// Anti-poisoning injector, with a little bit of radiation healing as a treat
@@ -115,7 +115,7 @@
list_reagents = list(
/datum/reagent/medicine/c2/multiver = 10,
/datum/reagent/medicine/potass_iodide = 10,
- /datum/reagent/nitrous_oxide = 5,
+ /datum/reagent/toxin/lipolicide = 5,
)
// Epinephrine and helps a little bit against stuns and stamina damage
@@ -141,7 +141,7 @@
/datum/reagent/medicine/atropine = 10,
/datum/reagent/medicine/coagulant/fabricated = 5,
/datum/reagent/medicine/salbutamol = 5,
- /datum/reagent/toxin/staminatoxin = 5,
+ /datum/reagent/toxin/lipolicide = 5,
)
// Coagulant, really not a whole lot more
@@ -180,7 +180,7 @@
/datum/reagent/medicine/mine_salve = 5,
/datum/reagent/medicine/leporazine = 5,
/datum/reagent/medicine/c2/lenturi = 10,
- /datum/reagent/toxin/staminatoxin = 5,
+ /datum/reagent/toxin/lipolicide = 5,
)
// Stabilizes a lot of stats like drowsiness, sanity, dizziness, so on
diff --git a/modular_doppler/deforest_medical_items/code/medstation.dm b/modular_doppler/deforest_medical_items/code/medstation.dm
deleted file mode 100644
index 019cc57320d9e..0000000000000
--- a/modular_doppler/deforest_medical_items/code/medstation.dm
+++ /dev/null
@@ -1,55 +0,0 @@
-/obj/machinery/biogenerator/medstation
- name = "wall med-station"
- desc = "An advanced machine seen in frontier outposts and colonies capable of turning organic plant matter into \
- various emergency medical supplies and injectors. You can find one of these in the medical sections of just about \
- any frontier installation."
- icon = 'modular_doppler/deforest_medical_items/icons/medstation.dmi'
- circuit = null
- anchored = TRUE
- density = FALSE
- efficiency = 1
- productivity = 1
- show_categories = list(
- RND_CATEGORY_DEFOREST_MEDICAL,
- RND_CATEGORY_DEFOREST_BLOOD,
- )
- /// The item we turn into when repacked
- var/repacked_type = /obj/item/wallframe/frontier_medstation
-
-MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/biogenerator/medstation, 29)
-
-/obj/machinery/biogenerator/medstation/RefreshParts()
- . = ..()
- efficiency = 1
- productivity = 1
-
-/obj/machinery/biogenerator/medstation/default_unfasten_wrench(mob/user, obj/item/wrench/tool, time)
- user.balloon_alert(user, "deconstructing...")
- tool.play_tool_sound(src)
- if(tool.use_tool(src, user, 1 SECONDS))
- playsound(loc, 'sound/items/deconstruct.ogg', 50, TRUE)
- deconstruct(TRUE)
- return
-
-/obj/machinery/biogenerator/medstation/on_deconstruction(disassembled)
- if(disassembled)
- new repacked_type(drop_location())
-
-/obj/machinery/biogenerator/medstation/default_deconstruction_crowbar()
- return
-
-// Deployable item for cargo for the medstation
-
-/obj/item/wallframe/frontier_medstation
- name = "unmounted wall med-station"
- desc = "The innovative technology of a biogenerator to print medical supplies, but able to be mounted neatly on a wall out of the way."
- icon = 'modular_doppler/deforest_medical_items/icons/medstation.dmi'
- icon_state = "biogenerator_parts"
- w_class = WEIGHT_CLASS_NORMAL
- result_path = /obj/machinery/biogenerator/medstation
- pixel_shift = 29
- custom_materials = list(
- /datum/material/iron = SHEET_MATERIAL_AMOUNT * 5,
- /datum/material/silver = SHEET_MATERIAL_AMOUNT * 3,
- /datum/material/gold = SHEET_MATERIAL_AMOUNT,
- )
diff --git a/modular_doppler/deforest_medical_items/code/medstation_designs/blood.dm b/modular_doppler/deforest_medical_items/code/medstation_designs/blood.dm
deleted file mode 100644
index 0d523d14f4fa7..0000000000000
--- a/modular_doppler/deforest_medical_items/code/medstation_designs/blood.dm
+++ /dev/null
@@ -1,131 +0,0 @@
-/datum/design/organic_bloodbag_aplus
- name = "A+ Blood Pack"
- id = "organic_bloodbag_aplus"
- build_type = BIOGENERATOR
- materials = list(/datum/material/biomass = 100)
- build_path = /obj/item/reagent_containers/blood/a_plus
- category = list(
- RND_CATEGORY_INITIAL,
- RND_CATEGORY_DEFOREST_BLOOD,
- )
-
-/datum/design/organic_bloodbag_aminus
- name = "A- Blood Pack"
- id = "organic_bloodbag_aminus"
- build_type = BIOGENERATOR
- materials = list(/datum/material/biomass = 100)
- build_path = /obj/item/reagent_containers/blood/a_minus
- category = list(
- RND_CATEGORY_INITIAL,
- RND_CATEGORY_DEFOREST_BLOOD,
- )
-
-/datum/design/organic_bloodbag_bplus
- name = "B+ Blood Pack"
- id = "organic_bloodbag_bplus"
- build_type = BIOGENERATOR
- materials = list(/datum/material/biomass = 100)
- build_path = /obj/item/reagent_containers/blood/b_plus
- category = list(
- RND_CATEGORY_INITIAL,
- RND_CATEGORY_DEFOREST_BLOOD,
- )
-
-/datum/design/organic_bloodbag_bminus
- name = "B- Blood Pack"
- id = "organic_bloodbag_bminus"
- build_type = BIOGENERATOR
- materials = list(/datum/material/biomass = 100)
- build_path = /obj/item/reagent_containers/blood/b_minus
- category = list(
- RND_CATEGORY_INITIAL,
- RND_CATEGORY_DEFOREST_BLOOD,
- )
-
-/datum/design/organic_bloodbag_oplus
- name = "O+ Blood Pack"
- id = "organic_bloodbag_oplus"
- build_type = BIOGENERATOR
- materials = list(/datum/material/biomass = 100)
- build_path = /obj/item/reagent_containers/blood/o_plus
- category = list(
- RND_CATEGORY_INITIAL,
- RND_CATEGORY_DEFOREST_BLOOD,
- )
-
-/datum/design/organic_bloodbag_ominus
- name = "O- Blood Pack"
- id = "organic_bloodbag_ominus"
- build_type = BIOGENERATOR
- materials = list(/datum/material/biomass = 150)
- build_path = /obj/item/reagent_containers/blood/o_minus
- category = list(
- RND_CATEGORY_INITIAL,
- RND_CATEGORY_DEFOREST_BLOOD,
- )
-
-/datum/design/organic_bloodbag_lizard
- name = "L Blood Pack"
- id = "organic_bloodbag_lizard"
- build_type = BIOGENERATOR
- materials = list(/datum/material/biomass = 100)
- build_path = /obj/item/reagent_containers/blood/lizard
- category = list(
- RND_CATEGORY_INITIAL,
- RND_CATEGORY_DEFOREST_BLOOD,
- )
-
-/datum/design/organic_bloodbag_ethereal
- name = "LE Blood Pack"
- id = "organic_bloodbag_ethereal"
- build_type = BIOGENERATOR
- materials = list(/datum/material/biomass = 100)
- build_path = /obj/item/reagent_containers/blood/ethereal
- category = list(
- RND_CATEGORY_INITIAL,
- RND_CATEGORY_DEFOREST_BLOOD,
- )
-
-/datum/design/organic_bloodbag_plant
- name = "H2O Blood Pack"
- id = "organic_bloodbag_plant"
- build_type = BIOGENERATOR
- materials = list(/datum/material/biomass = 50)
- build_path = /obj/item/reagent_containers/blood/podperson
- category = list(
- RND_CATEGORY_INITIAL,
- RND_CATEGORY_DEFOREST_BLOOD,
- )
-
-/datum/design/organic_bloodbag_slimeperson
- name = "TOX Blood Pack"
- id = "organic_bloodbag_slimeperson"
- build_type = BIOGENERATOR
- materials = list(/datum/material/biomass = 100)
- build_path = /obj/item/reagent_containers/blood/toxin
- category = list(
- RND_CATEGORY_INITIAL,
- RND_CATEGORY_DEFOREST_BLOOD,
- )
-
-/datum/design/organic_bloodbag_robot
- name = "R Blood Pack"
- id = "organic_bloodbag_robot"
- build_type = BIOGENERATOR
- materials = list(/datum/material/biomass = 100)
- build_path = /obj/item/reagent_containers/blood/robot
- category = list(
- RND_CATEGORY_INITIAL,
- RND_CATEGORY_DEFOREST_BLOOD,
- )
-
-/datum/design/organic_bloodbag_bug
- name = "I Blood Pack"
- id = "organic_bloodbag_bug"
- build_type = BIOGENERATOR
- materials = list(/datum/material/biomass = 100)
- build_path = /obj/item/reagent_containers/blood/bug
- category = list(
- RND_CATEGORY_INITIAL,
- RND_CATEGORY_DEFOREST_BLOOD,
- )
diff --git a/modular_doppler/deforest_medical_items/code/medstation_designs/medical.dm b/modular_doppler/deforest_medical_items/code/medstation_designs/medical.dm
deleted file mode 100644
index 7eb8106e3a4e4..0000000000000
--- a/modular_doppler/deforest_medical_items/code/medstation_designs/medical.dm
+++ /dev/null
@@ -1,98 +0,0 @@
-/datum/design/organic_printer_balm
- name = "Red Sun Balm"
- id = "organic_sun_balm"
- build_type = BIOGENERATOR
- materials = list(/datum/material/biomass = 50)
- build_path = /obj/item/stack/medical/ointment/red_sun
- category = list(
- RND_CATEGORY_INITIAL,
- RND_CATEGORY_DEFOREST_MEDICAL,
- )
-
-/datum/design/organic_printer_gauze
- name = "Sealed Aseptic Guaze"
- id = "organic_gauze"
- build_type = BIOGENERATOR
- materials = list(/datum/material/biomass = 50)
- build_path = /obj/item/stack/medical/gauze/sterilized
- category = list(
- RND_CATEGORY_INITIAL,
- RND_CATEGORY_DEFOREST_MEDICAL,
- )
-
-/datum/design/organic_printer_coagulant_f
- name = "Coagulant-F Packet"
- id = "organic_coagulant_pack"
- build_type = BIOGENERATOR
- materials = list(/datum/material/biomass = 50)
- build_path = /obj/item/stack/medical/suture/coagulant
- category = list(
- RND_CATEGORY_INITIAL,
- RND_CATEGORY_DEFOREST_MEDICAL,
- )
-
-/datum/design/organic_printer_ointment
- name = "Ointment"
- id = "organic_ointment"
- build_type = BIOGENERATOR
- materials = list(/datum/material/biomass = 25)
- build_path = /obj/item/stack/medical/ointment
- category = list(
- RND_CATEGORY_INITIAL,
- RND_CATEGORY_DEFOREST_MEDICAL,
- )
-
-/datum/design/organic_printer_bruise_pack
- name = "Bruise Packs"
- id = "organic_bruise_packs"
- build_type = BIOGENERATOR
- materials = list(/datum/material/biomass = 25)
- build_path = /obj/item/stack/medical/bruise_pack
- category = list(
- RND_CATEGORY_INITIAL,
- RND_CATEGORY_DEFOREST_MEDICAL,
- )
-
-/datum/design/organic_printer_amollin_pill
- name = "Amollin Painkiller"
- id = "organic_printer_amollin_pill"
- build_type = BIOGENERATOR
- materials = list(/datum/material/biomass = 25)
- build_path = /obj/item/reagent_containers/pill/amollin
- category = list(
- RND_CATEGORY_INITIAL,
- RND_CATEGORY_DEFOREST_MEDICAL,
- )
-
-/datum/design/organic_printer_bandaid
- name = "First Aid Bandage"
- id = "organic_bandaid"
- build_type = BIOGENERATOR
- materials = list(/datum/material/biomass = 100)
- build_path = /obj/item/stack/medical/bandage
- category = list(
- RND_CATEGORY_INITIAL,
- RND_CATEGORY_DEFOREST_MEDICAL,
- )
-
-/datum/design/organic_printer_bone_gel
- name = "Bone Gel"
- id = "organic_bone_gel"
- build_type = BIOGENERATOR
- materials = list(/datum/material/biomass = 100)
- build_path = /obj/item/stack/medical/bone_gel
- category = list(
- RND_CATEGORY_INITIAL,
- RND_CATEGORY_DEFOREST_MEDICAL,
- )
-
-/datum/design/organic_printer_surgical_tape
- name = "Surgical Tape"
- id = "organic_surgical_tape"
- build_type = BIOGENERATOR
- materials = list(/datum/material/biomass = 100)
- build_path = /obj/item/stack/sticky_tape/surgical
- category = list(
- RND_CATEGORY_INITIAL,
- RND_CATEGORY_DEFOREST_MEDICAL,
- )
diff --git a/modular_doppler/deforest_medical_items/code/storage_items.dm b/modular_doppler/deforest_medical_items/code/storage_items.dm
index 4380b66587921..bff050345dea5 100644
--- a/modular_doppler/deforest_medical_items/code/storage_items.dm
+++ b/modular_doppler/deforest_medical_items/code/storage_items.dm
@@ -393,104 +393,3 @@
/obj/item/bodybag,
/obj/item/storage/hypospraykit,
))
-
-// Midrange bag for paramedics, hypospray and more flexible item wise than surgical, but restricted to small items only
-/obj/item/storage/backpack/duffelbag/deforest_paramedic
- name = "medical technician kit"
- desc = "Compared to its sibling the first responder surgical kit, this variant is equipped with a hypospray hit for roving paramedics. Featuring rapid access pockets that are lightweight, it can however only hold smaller items."
- icon = 'modular_doppler/deforest_medical_items/icons/storage.dmi'
- icon_state = "technician"
- lefthand_file = 'modular_doppler/deforest_medical_items/icons/inhands/cases_lefthand.dmi'
- righthand_file = 'modular_doppler/deforest_medical_items/icons/inhands/cases_righthand.dmi'
- inhand_icon_state = "technician"
- worn_icon = 'modular_doppler/deforest_medical_items/icons/worn/worn.dmi'
-// worn_icon_teshari = 'modular_doppler/deforest_medical_items/icons/worn/worn_teshari.dmi'
- equip_sound = 'sound/items/equip/jumpsuit_equip.ogg'
- pickup_sound = 'sound/items/handling/cloth_pickup.ogg'
- drop_sound = 'sound/items/handling/cloth_drop.ogg'
- slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_BELT
- storage_type = /datum/storage/duffel/deforest_paramedic
- zip_slowdown = 0.3 // Midrange between the other two bags
- unzip_duration = 1.2 SECONDS
-
-/obj/item/storage/backpack/duffelbag/deforest_paramedic/stocked
-
-/obj/item/storage/backpack/duffelbag/deforest_paramedic/stocked/PopulateContents()
- var/static/items_inside = list(
- /obj/item/scalpel = 1,
- /obj/item/hemostat = 1,
- /obj/item/retractor = 1,
- /obj/item/circular_saw = 1,
- /obj/item/bonesetter = 1,
- /obj/item/cautery = 1,
- /obj/item/surgical_drapes = 1,
- /obj/item/stack/medical/bone_gel = 1,
- /obj/item/stack/medical/wound_recovery = 1,
- /obj/item/stack/medical/wound_recovery/rapid_coagulant = 1,
- /obj/item/stack/medical/mesh/advanced = 2,
- /obj/item/stack/medical/suture/medicated = 2,
- /obj/item/stack/medical/gauze/sterilized = 1,
- /obj/item/storage/pill_bottle/painkiller = 1,
- /obj/item/hypospray/mkii/piercing/atropine = 1,
- /obj/item/reagent_containers/cup/hypovial/small/libital = 1,
- /obj/item/reagent_containers/cup/hypovial/small/lenturi = 1,
- /obj/item/reagent_containers/cup/hypovial/small/seiver = 1,
- /obj/item/healthanalyzer = 1,
- )
- generate_items_inside(items_inside,src)
-
-/datum/storage/duffel/deforest_paramedic
- max_specific_storage = WEIGHT_CLASS_SMALL
- max_total_storage = 21 * WEIGHT_CLASS_SMALL
- max_slots = 21
-
-/datum/storage/duffel/deforest_paramedic/New()
- . = ..()
-
- can_hold = typecacheof(list(
- /obj/item/bonesetter,
- /obj/item/cautery,
- /obj/item/circular_saw,
- /obj/item/clothing/neck/stethoscope,
- /obj/item/clothing/mask/breath,
- /obj/item/clothing/mask/muzzle,
- /obj/item/clothing/mask/surgical,
- /obj/item/clothing/suit/toggle/labcoat/hospitalgown,
- /obj/item/dnainjector,
- /obj/item/extinguisher/mini,
- /obj/item/flashlight/pen,
- /obj/item/geiger_counter,
- /obj/item/healthanalyzer,
- /obj/item/hemostat,
- /obj/item/holosign_creator/medical,
- /obj/item/hypospray,
- /obj/item/implant,
- /obj/item/implantcase,
- /obj/item/implanter,
- /obj/item/lazarus_injector,
- /obj/item/lighter,
- /obj/item/pinpointer/crew,
- /obj/item/reagent_containers/blood,
- /obj/item/reagent_containers/dropper,
- /obj/item/reagent_containers/cup/beaker,
- /obj/item/reagent_containers/cup/bottle,
- /obj/item/reagent_containers/cup/hypovial,
- /obj/item/reagent_containers/cup/tube,
- /obj/item/reagent_containers/hypospray,
- /obj/item/reagent_containers/medigel,
- /obj/item/reagent_containers/pill,
- /obj/item/reagent_containers/spray,
- /obj/item/reagent_containers/syringe,
- /obj/item/retractor,
- /obj/item/scalpel,
- /obj/item/surgical_drapes,
- /obj/item/stack/medical,
- /obj/item/stack/sticky_tape,
- /obj/item/sensor_device,
- /obj/item/storage/fancy/cigarettes,
- /obj/item/storage/pill_bottle,
- /obj/item/tank/internals/emergency_oxygen,
- /obj/item/storage/box/bandages,
- /obj/item/bodybag,
- /obj/item/storage/hypospraykit,
- ))
diff --git a/modular_doppler/deforest_medical_items/code/treatment_zone_projector.dm b/modular_doppler/deforest_medical_items/code/treatment_zone_projector.dm
index 78a9a0dd7dc7b..0ecdefeb3f81e 100644
--- a/modular_doppler/deforest_medical_items/code/treatment_zone_projector.dm
+++ b/modular_doppler/deforest_medical_items/code/treatment_zone_projector.dm
@@ -5,7 +5,7 @@
desc = "A massive glowing holosign warning you to keep out of it, there's probably some important stuff happening in there!"
icon = 'modular_doppler/deforest_medical_items/icons/telegraph_96x96.dmi'
icon_state = "treatment_zone"
- layer = BELOW_OBJ_LAYER
+ layer = BOT_PATH_LAYER
pixel_x = -32
pixel_y = -32
use_vis_overlay = FALSE
diff --git a/modular_doppler/deforest_medical_items/icons/inhands/cases_lefthand.dmi b/modular_doppler/deforest_medical_items/icons/inhands/cases_lefthand.dmi
index 61e9fb5f7501c..c53eab3ba9d76 100644
Binary files a/modular_doppler/deforest_medical_items/icons/inhands/cases_lefthand.dmi and b/modular_doppler/deforest_medical_items/icons/inhands/cases_lefthand.dmi differ
diff --git a/modular_doppler/deforest_medical_items/icons/inhands/cases_righthand.dmi b/modular_doppler/deforest_medical_items/icons/inhands/cases_righthand.dmi
index b09d02d258a6c..c5a2099e96b20 100644
Binary files a/modular_doppler/deforest_medical_items/icons/inhands/cases_righthand.dmi and b/modular_doppler/deforest_medical_items/icons/inhands/cases_righthand.dmi differ
diff --git a/modular_doppler/deforest_medical_items/icons/injectors.dmi b/modular_doppler/deforest_medical_items/icons/injectors.dmi
index 62db86d583b21..50f4f2c4db8a4 100644
Binary files a/modular_doppler/deforest_medical_items/icons/injectors.dmi and b/modular_doppler/deforest_medical_items/icons/injectors.dmi differ
diff --git a/modular_doppler/deforest_medical_items/icons/medstation.dmi b/modular_doppler/deforest_medical_items/icons/medstation.dmi
deleted file mode 100644
index 2de94bc420a8a..0000000000000
Binary files a/modular_doppler/deforest_medical_items/icons/medstation.dmi and /dev/null differ
diff --git a/modular_doppler/deforest_medical_items/icons/storage.dmi b/modular_doppler/deforest_medical_items/icons/storage.dmi
index 513aed6e2a1bd..bd4c2f7b0dd0a 100644
Binary files a/modular_doppler/deforest_medical_items/icons/storage.dmi and b/modular_doppler/deforest_medical_items/icons/storage.dmi differ
diff --git a/modular_doppler/deforest_medical_items/icons/telegraph_96x96.dmi b/modular_doppler/deforest_medical_items/icons/telegraph_96x96.dmi
index 8596bce378d80..5c99df6db6e34 100644
Binary files a/modular_doppler/deforest_medical_items/icons/telegraph_96x96.dmi and b/modular_doppler/deforest_medical_items/icons/telegraph_96x96.dmi differ
diff --git a/modular_doppler/deforest_medical_items/icons/worn/worn.dmi b/modular_doppler/deforest_medical_items/icons/worn/worn.dmi
index 942715fe56a7c..bf394833ef356 100644
Binary files a/modular_doppler/deforest_medical_items/icons/worn/worn.dmi and b/modular_doppler/deforest_medical_items/icons/worn/worn.dmi differ
diff --git a/modular_doppler/deforest_medical_items/icons/worn/worn_teshari.dmi b/modular_doppler/deforest_medical_items/icons/worn/worn_teshari.dmi
index 276804f908b30..ea7249f36dc4d 100644
Binary files a/modular_doppler/deforest_medical_items/icons/worn/worn_teshari.dmi and b/modular_doppler/deforest_medical_items/icons/worn/worn_teshari.dmi differ
diff --git a/modular_doppler/epic_loot/code/random_spawners_real.dm b/modular_doppler/epic_loot/code/random_spawners_real.dm
index eab701f4a1391..a10e736d3396c 100644
--- a/modular_doppler/epic_loot/code/random_spawners_real.dm
+++ b/modular_doppler/epic_loot/code/random_spawners_real.dm
@@ -473,7 +473,6 @@
/obj/item/flatpacked_machine/wind_turbine = 2,
/obj/item/folded_navigation_gigabeacon = 1,
/obj/item/wallframe/cell_charger_multi = 2,
- /obj/item/wallframe/frontier_medstation = 1,
/obj/item/wallframe/wall_heater = 2,
/obj/item/wallframe/digital_clock = 1,
// Other things
diff --git a/modular_doppler/hearthkin/primitive_genemod/code/map_items.dm b/modular_doppler/hearthkin/primitive_genemod/code/map_items.dm
index de68e55406d6b..77e1639df6214 100644
--- a/modular_doppler/hearthkin/primitive_genemod/code/map_items.dm
+++ b/modular_doppler/hearthkin/primitive_genemod/code/map_items.dm
@@ -21,7 +21,7 @@
// Hotspring water with icebox air
/turf/open/water/hot_spring/icemoon
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas_mix = ICEMOON_DEFAULT_ATMOS
// The area
diff --git a/modular_doppler/kahraman_equipment/code/clothing/clothing.dm b/modular_doppler/kahraman_equipment/code/clothing/clothing.dm
index 59d461f9877a1..9a3002f51f5f7 100644
--- a/modular_doppler/kahraman_equipment/code/clothing/clothing.dm
+++ b/modular_doppler/kahraman_equipment/code/clothing/clothing.dm
@@ -34,7 +34,7 @@
BODYSHAPE_DIGITIGRADE_T = 'modular_doppler/kahraman_equipment/icons/clothes/clothing_worn_digi.dmi')
worn_icon_state = "boots"
armor_type = /datum/armor/colonist_clothing
- resistance_flags = NONE
+ resistance_flags = FIRE_PROOF
/obj/item/clothing/shoes/jackboots/frontier_colonist/Initialize(mapload)
. = ..()
@@ -178,7 +178,7 @@
min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT
heat_protection = HANDS
max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT
- resistance_flags = NONE
+ resistance_flags = FIRE_PROOF
clothing_traits = list(TRAIT_QUICK_CARRY)
/obj/item/clothing/gloves/frontier_colonist/Initialize(mapload)
diff --git a/modular_doppler/kahraman_equipment/code/organic_printer_designs/equipment.dm b/modular_doppler/kahraman_equipment/code/organic_printer_designs/equipment.dm
index 0ead8a75f6416..cc019598dc927 100644
--- a/modular_doppler/kahraman_equipment/code/organic_printer_designs/equipment.dm
+++ b/modular_doppler/kahraman_equipment/code/organic_printer_designs/equipment.dm
@@ -22,17 +22,6 @@
RND_CATEGORY_AKHTER_EQUIPMENT,
)
-/datum/design/frontier_medtech_belt
- name = "Medical Technician Kit"
- id = "frontier_medtech_belt"
- build_type = BIOGENERATOR
- materials = list(/datum/material/biomass = 200)
- build_path = /obj/item/storage/backpack/duffelbag/deforest_paramedic
- category = list(
- RND_CATEGORY_INITIAL,
- RND_CATEGORY_AKHTER_EQUIPMENT,
- )
-
/datum/design/frontier_medkit
name = "Frontier Medical Kit"
id = "frontier_medkit"
diff --git a/modular_doppler/loadout_categories/categories/belts.dm b/modular_doppler/loadout_categories/categories/belts.dm
index 3f67ccafa4c24..38694c991b551 100644
--- a/modular_doppler/loadout_categories/categories/belts.dm
+++ b/modular_doppler/loadout_categories/categories/belts.dm
@@ -129,10 +129,6 @@
name = "Frontier Med-kit"
item_path = /obj/item/storage/medkit/frontier/stocked
-/datum/loadout_item/belts/deforest_paramed
- name = "Satchel Tech-kit"
- item_path = /obj/item/storage/backpack/duffelbag/deforest_paramedic
-
/datum/loadout_item/belts/deforest_surgical
name = "Firest Responder Med-kit"
item_path = /obj/item/storage/backpack/duffelbag/deforest_surgical
diff --git a/modular_doppler/modular_cosmetics/code/hats/doppler_command_hats.dm b/modular_doppler/modular_cosmetics/code/hats/doppler_command_hats.dm
index 03dae2a276706..58a142223e279 100644
--- a/modular_doppler/modular_cosmetics/code/hats/doppler_command_hats.dm
+++ b/modular_doppler/modular_cosmetics/code/hats/doppler_command_hats.dm
@@ -8,12 +8,24 @@
name = "generic command hardhat"
desc = "A heavy-duty hardhat for protecting the heads of the heads when everything starts to go wrong."
icon = 'modular_doppler/modular_cosmetics/icons/obj/head/doppler_command_hardhats.dmi'
- worn_icon = 'modular_doppler/modular_cosmetics/icons/mob/head/doppler_command_hardhats.dmi'
- resistance_flags = FIRE_PROOF | ACID_PROOF
icon_state = null
hat_type = null
+ worn_icon = 'modular_doppler/modular_cosmetics/icons/mob/head/doppler_command_hardhats.dmi'
mask_overlay_icon = 'modular_doppler/modular_cosmetics/icons/mob/head/doppler_command_hardhats.dmi'
+ resistance_flags = FIRE_PROOF | ACID_PROOF
+ clothing_flags = STOPSPRESSUREDAMAGE | STACKABLE_HELMET_EXEMPT
+ heat_protection = HEAD
+ max_heat_protection_temperature = FIRE_HELM_MAX_TEMP_PROTECT
+ cold_protection = HEAD
+ min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT
+ light_range = 4
+
+/obj/item/clothing/head/utility/hardhat/welding/doppler_command/worn_overlays(mutable_appearance/standing, isinhands, icon_file)
+ . = ..()
+ if(!isinhands)
+ . += emissive_appearance(icon_file, "hardhat_emissive", src, alpha = src.alpha)
+
/obj/item/clothing/head/utility/hardhat/welding/doppler_command/medical
name = "medical command hardhat"
icon_state = "hardhat0_med"
diff --git a/modular_doppler/modular_cosmetics/code/neck/doppler_command_mantles.dm b/modular_doppler/modular_cosmetics/code/neck/doppler_command_mantles.dm
index 157179f2d697a..449221da02e09 100644
--- a/modular_doppler/modular_cosmetics/code/neck/doppler_command_mantles.dm
+++ b/modular_doppler/modular_cosmetics/code/neck/doppler_command_mantles.dm
@@ -9,6 +9,11 @@
body_parts_covered = CHEST|ARMS
resistance_flags = FIRE_PROOF | ACID_PROOF
+/obj/item/clothing/neck/doppler_mantle/worn_overlays(mutable_appearance/standing, isinhands, icon_file)
+ . = ..()
+ if(!isinhands)
+ . += emissive_appearance(icon_file, "mantle-emissive", src, alpha = src.alpha)
+
/obj/item/clothing/neck/doppler_mantle/medical
name = "medical command mantle"
icon_state = "doppler_med"
diff --git a/modular_doppler/modular_cosmetics/icons/mob/head/doppler_command_hardhats.dmi b/modular_doppler/modular_cosmetics/icons/mob/head/doppler_command_hardhats.dmi
index d35fc86f23462..bb116dbd0c717 100644
Binary files a/modular_doppler/modular_cosmetics/icons/mob/head/doppler_command_hardhats.dmi and b/modular_doppler/modular_cosmetics/icons/mob/head/doppler_command_hardhats.dmi differ
diff --git a/modular_doppler/modular_cosmetics/icons/mob/neck/doppler_mantles.dmi b/modular_doppler/modular_cosmetics/icons/mob/neck/doppler_mantles.dmi
index 2b42a8a04307c..0bcbf4e013017 100644
Binary files a/modular_doppler/modular_cosmetics/icons/mob/neck/doppler_mantles.dmi and b/modular_doppler/modular_cosmetics/icons/mob/neck/doppler_mantles.dmi differ
diff --git a/modular_doppler/modular_customization/markings/icons/markings/other_markings.dmi b/modular_doppler/modular_customization/markings/icons/markings/other_markings.dmi
index 3fea12fa5ca59..d699536db4b57 100644
Binary files a/modular_doppler/modular_customization/markings/icons/markings/other_markings.dmi and b/modular_doppler/modular_customization/markings/icons/markings/other_markings.dmi differ
diff --git a/modular_doppler/modular_medical/surgery/organs/internal/cyberimp.dm b/modular_doppler/modular_medical/surgery/organs/internal/cyberimp.dm
index 67dd334612759..7c0f5285f0da9 100644
--- a/modular_doppler/modular_medical/surgery/organs/internal/cyberimp.dm
+++ b/modular_doppler/modular_medical/surgery/organs/internal/cyberimp.dm
@@ -176,7 +176,6 @@
icon = 'modular_doppler/modular_medical/icons/implants.dmi'
icon_state = "steel"
items_to_create = list(/obj/item/pickaxe/drill/implant)
- implant_overlay = null
implant_color = null
/// The bodypart overlay datum we should apply to whatever mob we are put into's someone's arm
var/datum/bodypart_overlay/simple/steel_drill/drill_overlay
diff --git a/modular_doppler/modular_quirks/evil_replacements/bad_vibes.dm b/modular_doppler/modular_quirks/evil_replacements/bad_vibes.dm
new file mode 100644
index 0000000000000..0e2b0c927387b
--- /dev/null
+++ b/modular_doppler/modular_quirks/evil_replacements/bad_vibes.dm
@@ -0,0 +1,15 @@
+/datum/quirk/bad_vibes
+ name = "Bad Vibes"
+ desc = "By a quirk of your personality or exposure to too many horrible sights, you give off a bad aura which affects \
+ empaths and anyone else who looks too closely."
+ icon = FA_ICON_HAND_MIDDLE_FINGER
+ value = 0
+ mob_trait = TRAIT_BAD_VIBES
+ gain_text = span_notice("You give off a negative aura.")
+ lose_text = span_notice("You try to be more approachable.")
+ medical_record_text = "Patient scared away a nurse prior to physical examination."
+
+/datum/mood_event/bad_vibes
+ description = "Some people truly disturb me... What could happen to make someone like that?"
+ mood_change = -4
+ timeout = 1 MINUTES
diff --git a/modular_doppler/modular_quirks/evil_replacements/unholy_aura.dm b/modular_doppler/modular_quirks/evil_replacements/unholy_aura.dm
new file mode 100644
index 0000000000000..3689dcbe8682d
--- /dev/null
+++ b/modular_doppler/modular_quirks/evil_replacements/unholy_aura.dm
@@ -0,0 +1,15 @@
+/datum/quirk/unholy
+ name = "Unholy Aura"
+ desc = "Whether it's as a punishment for your actions or due to the circumstances of your birth, you've been cursed by \
+ whatever dieties take an interest in this sector. You have a harder time interacting with holy figures."
+ icon = FA_ICON_SMOG
+ value = -2
+ mob_trait = TRAIT_EVIL
+ gain_text = span_warning("A dispassionate gaze from on high weighs on you.")
+ lose_text = span_notice("The deities' gaze turns away.")
+ medical_record_text = "Patient has a strong aversion to religious figures."
+
+/datum/mood_event/holy_figure
+ description = "Holy people are anathema to me. I must be more careful..."
+ mood_change = -4
+ timeout = 1 MINUTES
diff --git a/modular_doppler/modular_species/species_types/android/android.dm b/modular_doppler/modular_species/species_types/android/android.dm
index dc7dca1bbed82..7287f5ec20501 100644
--- a/modular_doppler/modular_species/species_types/android/android.dm
+++ b/modular_doppler/modular_species/species_types/android/android.dm
@@ -1,7 +1,7 @@
/// The starter amount for the android's core
#define ENERGY_START_AMT 5 MEGA JOULES
/// The amount at which mob energy decreases
-#define ENERGY_DRAIN_AMT 5 KILO JOULES
+#define ENERGY_DRAIN_AMT 2.5 KILO JOULES
/datum/species/android
name = "Android"
@@ -71,6 +71,8 @@
QDEL_NULL(energy_tracker)
/datum/species/android/spec_revival(mob/living/carbon/human/target)
+ if(core_energy < 0.5 MEGA JOULES)
+ core_energy += 0.5 MEGA JOULES
playsound(target.loc, 'sound/machines/chime.ogg', 50, TRUE)
target.visible_message(span_notice("[target]'s LEDs flicker to life!"), span_notice("All systems nominal. You're back online!"))
@@ -91,11 +93,6 @@
return
if(core_energy > 0)
core_energy -= ENERGY_DRAIN_AMT
- // alerts
- if(core_energy <= 0.75 MEGA JOULES)
- if(prob(10))
- target.balloon_alert_to_viewers("power low!")
- playsound(target, 'sound/machines/beep/triple_beep.ogg', 50, FALSE)
// alerts end, death begins
if(core_energy <= 0)
target.death() // You can do a lot in a day.
diff --git a/modular_doppler/modular_species/species_types/android/android_hud.dm b/modular_doppler/modular_species/species_types/android/android_hud.dm
index 4b4786cf0d952..77c1da9166a57 100644
--- a/modular_doppler/modular_species/species_types/android/android_hud.dm
+++ b/modular_doppler/modular_species/species_types/android/android_hud.dm
@@ -1,5 +1,5 @@
/// 1 tile down
-#define UI_ENERGY_DISPLAY "WEST:6,CENTER-1:0"
+#define UI_ENERGY_DISPLAY "WEST:0,CENTER-1:0"
///Maptext define for Hemophage HUDs
#define FORMAT_ANDROID_HUD_TEXT(valuecolor, value) MAPTEXT("[round((value/1000000), 0.01)]MJ
")
@@ -11,9 +11,14 @@
name = "Energy Tracker"
icon_state = "energy_display"
screen_loc = UI_ENERGY_DISPLAY
+ maptext_width = 48
/atom/movable/screen/android/energy/proc/update_energy_hud(core_energy)
maptext = FORMAT_ANDROID_HUD_TEXT(hud_text_color(core_energy), core_energy)
+ if(core_energy <= 1.5 MEGA JOULES)
+ icon_state = "energy_display_low"
+ else
+ icon_state = "energy_display"
/atom/movable/screen/android/energy/proc/hud_text_color(core_energy)
return core_energy > 1.5 MEGA JOULES ? "#ffffff" : "#b64b4b"
diff --git a/modular_doppler/modular_species/species_types/android/icons/android_hud.dmi b/modular_doppler/modular_species/species_types/android/icons/android_hud.dmi
index b524cf6328041..7a08492320196 100644
Binary files a/modular_doppler/modular_species/species_types/android/icons/android_hud.dmi and b/modular_doppler/modular_species/species_types/android/icons/android_hud.dmi differ
diff --git a/modular_doppler/modular_vending/icons/de_forest_vendors.dmi b/modular_doppler/modular_vending/icons/de_forest_vendors.dmi
index 906191c451b36..25ad4c2c0f025 100644
Binary files a/modular_doppler/modular_vending/icons/de_forest_vendors.dmi and b/modular_doppler/modular_vending/icons/de_forest_vendors.dmi differ
diff --git a/modular_doppler/deforest_medical_items/code/chemicals/twitch.dm b/modular_doppler/the-business/code/twitch.dm
similarity index 80%
rename from modular_doppler/deforest_medical_items/code/chemicals/twitch.dm
rename to modular_doppler/the-business/code/twitch.dm
index 8d6b2ca392c6c..6951f8f07628d 100644
--- a/modular_doppler/deforest_medical_items/code/chemicals/twitch.dm
+++ b/modular_doppler/the-business/code/twitch.dm
@@ -8,9 +8,6 @@
// Reaction to make twitch, makes 10u from 17u input reagents
/datum/chemical_reaction/twitch
- results = list(
- /datum/reagent/drug/twitch = 10,
- )
required_reagents = list(
/datum/reagent/impedrezene = 5,
/datum/reagent/bluespace = 10,
@@ -19,14 +16,36 @@
mob_react = FALSE
reaction_tags = REACTION_TAG_EASY | REACTION_TAG_DRUG | REACTION_TAG_ORGAN | REACTION_TAG_DAMAGING
-// Twitch drug, makes the takers of it faster and able to dodge bullets while in their system, to potentially bad side effects
+/datum/chemical_reaction/twitch/on_reaction(datum/reagents/holder, datum/equilibrium/reaction, created_volume)
+ var/location = get_turf(holder.my_atom)
+ for(var/iteration in 1 to created_volume)
+ var/obj/item/reagent_containers/hypospray/medipen/deforest/twitch/new_injector = new(location)
+ new_injector.pixel_x = rand(-6, 6)
+ new_injector.pixel_y = rand(-6, 6)
+
+// Injector, because it needs to look kickass
+/obj/item/reagent_containers/hypospray/medipen/deforest/twitch
+ name = "T-WITCH vial"
+ desc = "An almost cartoonish looking glass injector filled with a horribly corrosive green liquid that slowly swirls around. \
+ A heavily regulated substance called T-WITCH that is claimed to make the users of it 'see faster'."
+ icon = 'modular_doppler/the-business/icons/items.dmi'
+ base_icon_state = "twitch"
+ icon_state = "twitch"
+ list_reagents = list(
+ /datum/reagent/drug/twitch = 10,
+ /datum/reagent/drug/maint/tar = 5,
+ /datum/reagent/medicine/silibinin = 5,
+ /datum/reagent/toxin/leadacetate = 5,
+ )
+
+// T-WITCH, makes the user faster in movement and attacks, they can even dodge projectiles when overdosing on it
/datum/reagent/drug/twitch
- name = "TWitch"
- description = "A drug originally developed by and for plutonians to assist them during raids. \
- Does not see wide use due to the whole reality-disassociation and heart disease thing afterwards. \
- Can be intentionally overdosed to increase the drug's effects"
+ name = "T-WITCH"
+ description = "An invention by the drug ~artists~ of Europa, a wicked stimulant that both slow's the user's \
+ perception of time and speeds of their actions. This is a recipe for some extreme performance, at heavy \
+ cost to the user's health in most cases."
reagent_state = LIQUID
- color = "#c22a44"
+ color = "#91db69"
taste_description = "television static"
metabolization_rate = 0.65 * REAGENTS_METABOLISM
ph = 3
@@ -41,7 +60,6 @@
/// How much the mob heating is multiplied by, if the target is a robot or has muscled veins
var/mob_heating_muliplier = 5
-
/datum/reagent/drug/twitch/on_mob_metabolize(mob/living/our_guy)
. = ..()
@@ -71,7 +89,6 @@
game_plane_master_controller.add_filter(TWITCH_SCREEN_BLUR, 1, list("type" = "radial_blur", "size" = 0.02))
-
/datum/reagent/drug/twitch/on_mob_end_metabolize(mob/living/carbon/our_guy)
. = ..()
@@ -80,8 +97,6 @@
our_guy.sound_environment_override = NONE
- speech_effect_span = "hierophant"
-
UnregisterSignal(our_guy, COMSIG_MOVABLE_MOVED)
UnregisterSignal(our_guy, COMSIG_MOVABLE_HEAR)
if(overdosed)
@@ -90,13 +105,13 @@
if(constant_dose_time < CONSTANT_DOSE_SAFE_LIMIT) // Anything less than this and you'll come out fiiiine, aside from a big hit of stamina damage
if(!(our_guy.mob_biotypes & MOB_ROBOTIC))
our_guy.visible_message(
- span_danger("[our_guy] suddenly slows from [our_guy.p_their()] inhuman speeds, coming back with a wicked nosebleed!"),
- span_danger("You suddenly slow back to normal, a stream of blood gushing from your nose!")
+ span_danger("[our_guy] stops dead, [our_guy.p_their()] afterimages quickly catching up to them!"),
+ span_danger("You suddenly stop dead in your tracks, a stream of blood gushing from your nose!")
)
else
our_guy.visible_message(
- span_danger("[our_guy] suddenly slows from [our_guy.p_their()] inhuman speeds!"),
- span_danger("You suddenly slow back to normal speed!")
+ span_danger("[our_guy] stops dead, [our_guy.p_their()] afterimages quickly catching up to them!"),
+ span_danger("You suddenly stop dead in your tracks!")
)
our_guy.adjustStaminaLoss(constant_dose_time)
@@ -105,13 +120,13 @@
our_guy.spray_blood(our_guy.dir, 2) // The before mentioned coughing up blood
our_guy.emote("cough")
our_guy.visible_message(
- span_danger("[our_guy] suddenly snaps back from [our_guy.p_their()] inhuman speeds, coughing up a spray of blood!"),
- span_danger("As you snap back to normal speed you cough up a worrying amount of blood. You feel like you've just been run over by a power loader.")
+ span_danger("[our_guy] stops dead, coughing up a spray of blood!"),
+ span_danger("As you stop dead in your tracks, you cough up a worrying amount of blood.")
)
else
our_guy.visible_message(
- span_danger("[our_guy] suddenly snaps back from [our_guy.p_their()] inhuman speeds!"),
- span_danger("You suddenly snap back to normal speeds. You feel like you've just been run over by a power loader.")
+ span_danger("[our_guy] stops dead, heat venting from [our_guy.p_their()] body!"),
+ span_danger("You suddenly stop dead in your tracks, superheated air venting from your body!")
)
our_guy.adjustStaminaLoss(constant_dose_time)
if(!HAS_TRAIT(our_guy, TRAIT_TWITCH_ADAPTED))
@@ -120,18 +135,18 @@
if(!our_guy.hud_used)
return
+ our_guy.Stun(1 SECONDS)
+
var/atom/movable/plane_master_controller/game_plane_master_controller = our_guy.hud_used.plane_master_controllers[PLANE_MASTERS_GAME]
game_plane_master_controller.remove_filter(TWITCH_SCREEN_FILTER)
game_plane_master_controller.remove_filter(TWITCH_SCREEN_BLUR)
-
/// Leaves an afterimage behind the mob when they move
/datum/reagent/drug/twitch/proc/on_movement(mob/living/carbon/our_guy, atom/old_loc)
SIGNAL_HANDLER
new /obj/effect/temp_visual/decoy/twitch_afterimage(old_loc, our_guy)
-
/// Tries to dodge incoming bullets if we aren't disabled for any reasons
/datum/reagent/drug/twitch/proc/dodge_bullets(mob/living/carbon/human/source, obj/projectile/hitting_projectile, def_zone)
SIGNAL_HANDLER
@@ -147,7 +162,6 @@
addtimer(CALLBACK(source, TYPE_PROC_REF(/datum, remove_filter), TWITCH_BLUR_EFFECT), 0.5 SECONDS)
return COMPONENT_BULLET_PIERCED
-
/datum/reagent/drug/twitch/on_mob_life(mob/living/carbon/our_guy, seconds_per_tick, times_fired)
. = ..()
@@ -168,10 +182,11 @@
if(locate(/datum/reagent/drug/kronkaine) in our_guy.reagents.reagent_list) // Kronkaine, another heart-straining drug, could cause problems if mixed with this
our_guy.ForceContractDisease(new /datum/disease/adrenal_crisis(), FALSE, TRUE)
-
/datum/reagent/drug/twitch/overdose_start(mob/living/our_guy)
. = ..()
+ speech_effect_span = "hierophant"
+
RegisterSignal(our_guy, COMSIG_ATOM_PRE_BULLET_ACT, PROC_REF(dodge_bullets))
our_guy.next_move_modifier -= 0.2 // Overdosing makes you a liiitle faster but you know has some really bad consequences
@@ -186,7 +201,6 @@
for(var/filter in game_plane_master_controller.get_filters(TWITCH_SCREEN_FILTER))
animate(filter, loop = -1, color = col_filter_ourple, time = 4 SECONDS, easing = BOUNCE_EASING)
-
/datum/reagent/drug/twitch/overdose_process(mob/living/carbon/our_guy, seconds_per_tick, times_fired)
. = ..()
our_guy.set_jitter_if_lower(10 SECONDS * REM * seconds_per_tick)
@@ -205,9 +219,8 @@
our_guy.adjustToxLoss(1 * REM * seconds_per_tick, updating_health = FALSE, forced = TRUE, required_biotype = affected_biotype)
if(SPT_PROB(5, seconds_per_tick) && !(our_guy.mob_biotypes & MOB_ROBOTIC))
- to_chat(our_guy, span_danger("You cough up a splatter of blood!"))
- our_guy.spray_blood(our_guy.dir, 1)
- our_guy.emote("cough")
+ our_guy.playsound_local(our_guy, 'sound/effects/singlebeat.ogg', 100, TRUE)
+ flash_color(our_guy, flash_color = "#ff0000", flash_time = 3 SECONDS)
if(SPT_PROB(10, seconds_per_tick))
our_guy.add_filter(TWITCH_OVERDOSE_BLUR_EFFECT, 2, phase_filter(8))
@@ -218,7 +231,6 @@
SIGNAL_HANDLER
hearing_args[HEARING_RAW_MESSAGE] = "[hearing_args[HEARING_RAW_MESSAGE]]"
-
/// Cool filter that I'm using for some of this :)))
/proc/phase_filter(size)
. = list("type" = "wave")
@@ -226,7 +238,6 @@
if(!isnull(size))
.["size"] = size
-
// Temp visual that changes color for that bootleg sandevistan effect
/obj/effect/temp_visual/decoy/twitch_afterimage
duration = 0.75 SECONDS
diff --git a/modular_doppler/the-business/icons/items.dmi b/modular_doppler/the-business/icons/items.dmi
new file mode 100644
index 0000000000000..805f33631ea88
Binary files /dev/null and b/modular_doppler/the-business/icons/items.dmi differ
diff --git a/rust_g.dll b/rust_g.dll
index d3aebf7121706..157fb64acaf33 100644
Binary files a/rust_g.dll and b/rust_g.dll differ
diff --git a/sound/attributions.txt b/sound/attributions.txt
index a6cbf21f8369b..ff83a24ab8230 100644
--- a/sound/attributions.txt
+++ b/sound/attributions.txt
@@ -23,7 +23,6 @@ champagne_pop.ogg is credited to ultradust on freesound https://freesound.org/pe
can_open.ogg adapted from https://freesound.org/people/MaxDemianAGL/sounds/130031/
can_shake.ogg adapted from https://freesound.org/people/mcmast/sounds/456703/
-
splatter.ogg adapted from https://freesound.org/people/Rocktopus/sounds/233418/
hohoho.ogg and hehe.ogg are cut from a recording by Nanakisan on freesound: https://freesound.org/people/Nanakisan/sounds/253534/
mbox_full.ogg and mbox_end.ogg make use of The Ragtime Drummer by James Lent, in the public domain
@@ -181,8 +180,6 @@ https://freesound.org/people/shw489/sounds/234389/
soup_boil1.ogg through soup_boil5.ogg and soup_boil_end.ogg are taken from Boiling Soup from Freesoung.org (CC4) and converted to OGG / split apart (but is otherwise unchanged):
https://freesound.org/people/jorickhoofd/sounds/632783/
-
-
valve_opening.ogg was made by mixing water flowing samples from:
https://freesound.org/people/scriotxstudios/sounds/349111/?attribution=1 and squeaky scrape sound from:
https://freesound.org/people/Department64/sounds/669028/ which was modified with lower pitch
@@ -191,7 +188,6 @@ liquid_pour2.ogg and liquid_pour3.ogg were cut from
https://freesound.org/people/MattRuthSound/sounds/561896/
https://freesound.org/people/MattRuthSound/sounds/561895/
-
roaring_fire.ogg made from: 10835 big fire loop.wav by Robinhood76 -- https://freesound.org/s/612277/ -- License: Attribution NonCommercial 4.0
fire_puff made from: Bonfire Being Lit by samararaine -- https://freesound.org/s/186374/ -- License: Creative Commons 0
@@ -208,8 +204,6 @@ Bottle Tap.wav by alex_alexalex -- https://freesound.org/s/395492/ -- License: A
beaker_place.ogg was made by cutting and lowering pitch:
place glass object.wav by milpower -- https://freesound.org/s/353105/ -- License: Creative Commons 0
-
-
glass_reverse.ogg is adapted from a combination of:
https://freesound.org/people/C_Rogers/sounds/203368/ -- glass-shattering-hit_01.ogg by C_Rogers on freesound.org (CC0)
https://freesound.org/people/Czarcazas/sounds/330800/ -- Audio reversal/fading of Shattering Glass (Small) by Czarcazas -- https://freesound.org/s/330800/ -- License: Attribution 3.0
@@ -217,3 +211,5 @@ https://freesound.org/people/Czarcazas/sounds/330800/ -- Audio reversal/fading o
sound/effects/bonk.ogg - recorded by oranges on a coke zero bottle, edited by ninjanomnom, released to public domain
sound\items\weapons\hammer_death_scream.ogg - Undefeatablesos' scream recorded by Niron3206, edited by Niron3206, License: Creative Commons 0
+
+sound/machines/sink-faucet.ogg -- https://freesound.org/people/FOSSarts/sounds/740086/ -- by FOSSarts (CC0)
diff --git a/sound/items/weapons/peashoot.ogg b/sound/items/weapons/peashoot.ogg
new file mode 100644
index 0000000000000..de4d5c1e46458
Binary files /dev/null and b/sound/items/weapons/peashoot.ogg differ
diff --git a/sound/machines/license.txt b/sound/machines/license.txt
index dbccfd7ea096d..69e52c94e4b74 100644
--- a/sound/machines/license.txt
+++ b/sound/machines/license.txt
@@ -4,3 +4,5 @@ This is licensed under CC-BY 4.0, found at https://creativecommons.org/licenses/
shutter.ogg adapted from Joseph Sardin on BigSoundBank
https://bigsoundbank.com/detail-2475-manual-roller-shutter-closing-out-2.html
+
+mail_sort.ogg adapted from csigusz_foxoup ob Freesound https://freesound.org/people/csigusz_foxoup/sounds/711428/
\ No newline at end of file
diff --git a/sound/machines/mail_sort.ogg b/sound/machines/mail_sort.ogg
new file mode 100644
index 0000000000000..66ec79468d50b
Binary files /dev/null and b/sound/machines/mail_sort.ogg differ
diff --git a/sound/machines/sink-faucet.ogg b/sound/machines/sink-faucet.ogg
new file mode 100644
index 0000000000000..7102a3940308f
Binary files /dev/null and b/sound/machines/sink-faucet.ogg differ
diff --git a/sound/mobs/humanoids/ethereal/credits.txt b/sound/mobs/humanoids/ethereal/credits.txt
new file mode 100644
index 0000000000000..a157ceacf9edd
--- /dev/null
+++ b/sound/mobs/humanoids/ethereal/credits.txt
@@ -0,0 +1,2 @@
+ethereal_hiss.ogg majorly edited/mixed by Sothanforax, based off of the original audio:
+Remix of 101127__CGEffex__Bug_Zapper_Long_moth_electrocution_Remix.wav by Timbre -- https://freesound.org/s/101334/ -- License: Attribution NonCommercial 4.0
diff --git a/sound/mobs/humanoids/ethereal/ethereal_hiss.ogg b/sound/mobs/humanoids/ethereal/ethereal_hiss.ogg
new file mode 100644
index 0000000000000..969944ea4daa8
Binary files /dev/null and b/sound/mobs/humanoids/ethereal/ethereal_hiss.ogg differ
diff --git a/sound/mobs/humanoids/felinid/attribution.txt b/sound/mobs/humanoids/felinid/attribution.txt
new file mode 100644
index 0000000000000..dfd416150c6b3
--- /dev/null
+++ b/sound/mobs/humanoids/felinid/attribution.txt
@@ -0,0 +1 @@
+felinid_hiss is catHisses2.wav by Zabuhailo -- https://freesound.org/s/146962/ -- License: Creative Commons 0
\ No newline at end of file
diff --git a/sound/mobs/humanoids/felinid/felinid_hiss.ogg b/sound/mobs/humanoids/felinid/felinid_hiss.ogg
new file mode 100644
index 0000000000000..f343bd77fd1ff
Binary files /dev/null and b/sound/mobs/humanoids/felinid/felinid_hiss.ogg differ
diff --git a/sound/mobs/humanoids/human/attribution.txt b/sound/mobs/humanoids/human/attribution.txt
index 20b8c14889a06..f56dc03f794ba 100644
--- a/sound/mobs/humanoids/human/attribution.txt
+++ b/sound/mobs/humanoids/human/attribution.txt
@@ -1,4 +1,5 @@
The male sharp gasps are from https://freesound.org/people/bacruz666/sounds/341908/ and https://freesound.org/people/nettoi/sounds/677540/, the female sharp gasps are from https://freesound.org/people/drotzruhn/sounds/405203/
+human_hiss.ogg is all original work by Sothanforax, hereby licensed under CC BY-SA 3.0
{
male_sniff.ogg - https://freesound.org/people/Fluffayfish/sounds/327799/ , License: CC BY-NC 3.0
diff --git a/sound/mobs/humanoids/human/hiss/human_hiss.ogg b/sound/mobs/humanoids/human/hiss/human_hiss.ogg
new file mode 100644
index 0000000000000..15f643b422086
Binary files /dev/null and b/sound/mobs/humanoids/human/hiss/human_hiss.ogg differ
diff --git a/sound/mobs/humanoids/lizard/credits.txt b/sound/mobs/humanoids/lizard/credits.txt
index 814b758f44da9..820a38fb59376 100644
--- a/sound/mobs/humanoids/lizard/credits.txt
+++ b/sound/mobs/humanoids/lizard/credits.txt
@@ -1,2 +1,3 @@
lizard_scream_1 by n Beats. Lizard_scream_2 and lizard_scream_3 by -sihiL. Lizard_scream_3 edited Lord Saladin. Original PR by super12pl.
deathsound.ogg is originally "demon dying.wav" by THE_bizniss. It was converted and compressed into .ogg format. It and a link to its license can be found at https://freesound.org/s/37823/
+lizard_hiss was originally recorded by Garuda1982, minor editing by Sothanforax. license is at https://freesound.org/s/541656/
diff --git a/sound/mobs/humanoids/lizard/lizard_hiss.ogg b/sound/mobs/humanoids/lizard/lizard_hiss.ogg
new file mode 100644
index 0000000000000..202c7929a1372
Binary files /dev/null and b/sound/mobs/humanoids/lizard/lizard_hiss.ogg differ
diff --git a/tgstation.dme b/tgstation.dme
index 0d753fb4ab736..a6670aafba7e4 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -515,6 +515,7 @@
#include "code\__HELPERS\screen_objs.dm"
#include "code\__HELPERS\see_through_maps.dm"
#include "code\__HELPERS\shell.dm"
+#include "code\__HELPERS\shuttle.dm"
#include "code\__HELPERS\spatial_info.dm"
#include "code\__HELPERS\spawns.dm"
#include "code\__HELPERS\stack_trace.dm"
@@ -579,6 +580,7 @@
#include "code\_globalvars\lighting.dm"
#include "code\_globalvars\logging.dm"
#include "code\_globalvars\phobias.dm"
+#include "code\_globalvars\pipe_info.dm"
#include "code\_globalvars\rcd.dm"
#include "code\_globalvars\religion.dm"
#include "code\_globalvars\silo.dm"
@@ -601,6 +603,7 @@
#include "code\_globalvars\lists\names.dm"
#include "code\_globalvars\lists\objects.dm"
#include "code\_globalvars\lists\ores_spawned.dm"
+#include "code\_globalvars\lists\pipe_recipes.dm"
#include "code\_globalvars\lists\plumbing.dm"
#include "code\_globalvars\lists\poll_ignore.dm"
#include "code\_globalvars\lists\quirks.dm"
@@ -5997,28 +6000,32 @@
#include "code\modules\research\xenobiology\vatgrowing\samples\viruses\_virus.dm"
#include "code\modules\security_levels\keycard_authentication.dm"
#include "code\modules\security_levels\security_level_datums.dm"
-#include "code\modules\shuttle\arrivals.dm"
-#include "code\modules\shuttle\assault_pod.dm"
-#include "code\modules\shuttle\battlecruiser_starfury.dm"
-#include "code\modules\shuttle\computer.dm"
-#include "code\modules\shuttle\docking.dm"
-#include "code\modules\shuttle\elevator.dm"
-#include "code\modules\shuttle\emergency.dm"
-#include "code\modules\shuttle\ferry.dm"
-#include "code\modules\shuttle\infiltrator.dm"
-#include "code\modules\shuttle\manipulator.dm"
-#include "code\modules\shuttle\medisim.dm"
-#include "code\modules\shuttle\monastery.dm"
-#include "code\modules\shuttle\navigation_computer.dm"
-#include "code\modules\shuttle\on_move.dm"
-#include "code\modules\shuttle\ripple.dm"
#include "code\modules\shuttle\shuttle.dm"
-#include "code\modules\shuttle\shuttle_rotate.dm"
-#include "code\modules\shuttle\spaceship_navigation_beacon.dm"
-#include "code\modules\shuttle\special.dm"
-#include "code\modules\shuttle\supply.dm"
-#include "code\modules\shuttle\syndicate.dm"
-#include "code\modules\shuttle\white_ship.dm"
+#include "code\modules\shuttle\misc\manipulator.dm"
+#include "code\modules\shuttle\misc\medisim.dm"
+#include "code\modules\shuttle\misc\ripple.dm"
+#include "code\modules\shuttle\misc\spaceship_navigation_beacon.dm"
+#include "code\modules\shuttle\misc\special.dm"
+#include "code\modules\shuttle\mobile_port\mobile_port.dm"
+#include "code\modules\shuttle\mobile_port\shuttle_move.dm"
+#include "code\modules\shuttle\mobile_port\shuttle_move_callbacks.dm"
+#include "code\modules\shuttle\mobile_port\shuttle_rotate_callbacks.dm"
+#include "code\modules\shuttle\mobile_port\variants\arrivals.dm"
+#include "code\modules\shuttle\mobile_port\variants\assault_pod.dm"
+#include "code\modules\shuttle\mobile_port\variants\battlecruiser_starfury.dm"
+#include "code\modules\shuttle\mobile_port\variants\elevator.dm"
+#include "code\modules\shuttle\mobile_port\variants\ferry.dm"
+#include "code\modules\shuttle\mobile_port\variants\infiltrator.dm"
+#include "code\modules\shuttle\mobile_port\variants\supply.dm"
+#include "code\modules\shuttle\mobile_port\variants\emergency\emergency.dm"
+#include "code\modules\shuttle\mobile_port\variants\emergency\emergency_console.dm"
+#include "code\modules\shuttle\mobile_port\variants\emergency\emergency_types.dm"
+#include "code\modules\shuttle\mobile_port\variants\emergency\pods.dm"
+#include "code\modules\shuttle\shuttle_consoles\monastery.dm"
+#include "code\modules\shuttle\shuttle_consoles\navigation_computer.dm"
+#include "code\modules\shuttle\shuttle_consoles\shuttle_console.dm"
+#include "code\modules\shuttle\shuttle_consoles\syndicate.dm"
+#include "code\modules\shuttle\shuttle_consoles\white_ship.dm"
#include "code\modules\shuttle\shuttle_events\_shuttle_events.dm"
#include "code\modules\shuttle\shuttle_events\blackhole.dm"
#include "code\modules\shuttle\shuttle_events\carp.dm"
@@ -6028,6 +6035,8 @@
#include "code\modules\shuttle\shuttle_events\player_controlled.dm"
#include "code\modules\shuttle\shuttle_events\projectile.dm"
#include "code\modules\shuttle\shuttle_events\turbulence.dm"
+#include "code\modules\shuttle\stationary_port\port_types.dm"
+#include "code\modules\shuttle\stationary_port\stationary_port.dm"
#include "code\modules\spatial_grid\cell_tracker.dm"
#include "code\modules\spells\spell.dm"
#include "code\modules\spells\spell_types\madness_curse.dm"
@@ -6379,6 +6388,7 @@
#include "code\modules\vending\liberation.dm"
#include "code\modules\vending\liberation_toy.dm"
#include "code\modules\vending\magivend.dm"
+#include "code\modules\vending\mail.dm"
#include "code\modules\vending\medical.dm"
#include "code\modules\vending\medical_wall.dm"
#include "code\modules\vending\megaseed.dm"
@@ -6634,6 +6644,9 @@
#include "modular_doppler\cryosleep\code\mood.dm"
#include "modular_doppler\cryosleep\code\objective.dm"
#include "modular_doppler\cryosleep\code\objects\structures\signs\signs_maps.dm"
+#include "modular_doppler\damage_control\code\breach_gear.dm"
+#include "modular_doppler\damage_control\code\emergency_fab.dm"
+#include "modular_doppler\damage_control\code\emergency_fab_designs.dm"
#include "modular_doppler\deathmatch\deathmatch_loadouts.dm"
#include "modular_doppler\deathmatch\deathmatch_maps.dm"
#include "modular_doppler\deathmatch\deathmatch_structures.dm"
@@ -6641,16 +6654,12 @@
#include "modular_doppler\deforest_medical_items\code\healing_stack_items.dm"
#include "modular_doppler\deforest_medical_items\code\illegal_injectors.dm"
#include "modular_doppler\deforest_medical_items\code\injectors.dm"
-#include "modular_doppler\deforest_medical_items\code\medstation.dm"
#include "modular_doppler\deforest_medical_items\code\storage_items.dm"
#include "modular_doppler\deforest_medical_items\code\storage_items_robotics.dm"
#include "modular_doppler\deforest_medical_items\code\synth_healing.dm"
#include "modular_doppler\deforest_medical_items\code\treatment_zone_projector.dm"
#include "modular_doppler\deforest_medical_items\code\vulnerable_status_effect.dm"
#include "modular_doppler\deforest_medical_items\code\chemicals\demoneye.dm"
-#include "modular_doppler\deforest_medical_items\code\chemicals\twitch.dm"
-#include "modular_doppler\deforest_medical_items\code\medstation_designs\blood.dm"
-#include "modular_doppler\deforest_medical_items\code\medstation_designs\medical.dm"
#include "modular_doppler\disable_suicide\config_entries.dm"
#include "modular_doppler\doppler_command_uniforms\hop\overrides.dm"
#include "modular_doppler\dopplerboop\dopplerboops.dm"
@@ -7080,6 +7089,8 @@
#include "modular_doppler\modular_quirks\entombed\code\entombed.dm"
#include "modular_doppler\modular_quirks\entombed\code\entombed_alt_actions.dm"
#include "modular_doppler\modular_quirks\entombed\code\entombed_mod.dm"
+#include "modular_doppler\modular_quirks\evil_replacements\bad_vibes.dm"
+#include "modular_doppler\modular_quirks\evil_replacements\unholy_aura.dm"
#include "modular_doppler\modular_quirks\excitable\excitable.dm"
#include "modular_doppler\modular_quirks\fragility\code\fragile.dm"
#include "modular_doppler\modular_quirks\hardened_soles\hardened_soles.dm"
@@ -7202,6 +7213,7 @@
#include "modular_doppler\stone\code\ore_veins.dm"
#include "modular_doppler\stone\code\stone.dm"
#include "modular_doppler\tableflip\tableflip.dm"
+#include "modular_doppler\the-business\code\twitch.dm"
#include "modular_doppler\time_clock\code\console.dm"
#include "modular_doppler\time_clock\code\console_tgui.dm"
#include "modular_doppler\time_clock\code\mind.dm"
diff --git a/tgui/packages/tgui/interfaces/RapidPipeDispenser.tsx b/tgui/packages/tgui/interfaces/RapidPipeDispenser.tsx
index 3bfe22f816479..46b58c4e381bd 100644
--- a/tgui/packages/tgui/interfaces/RapidPipeDispenser.tsx
+++ b/tgui/packages/tgui/interfaces/RapidPipeDispenser.tsx
@@ -48,29 +48,6 @@ const TOOLS = [
},
];
-const LAYERS = [
- {
- name: '1',
- bitmask: 1,
- },
- {
- name: '2',
- bitmask: 2,
- },
- {
- name: '3',
- bitmask: 4,
- },
- {
- name: '4',
- bitmask: 8,
- },
- {
- name: '5',
- bitmask: 16,
- },
-] as const;
-
type DirectionsAllowed = {
north: BooleanLike;
south: BooleanLike;
@@ -113,19 +90,19 @@ type Preview = {
};
type Data = {
+ // Static
+ paint_colors: Colors;
+ max_pipe_layers: number;
// Dynamic
category: number;
pipe_layers: number;
multi_layer: BooleanLike;
- ducting_layer: number;
categories: Category[];
selected_recipe: string;
selected_color: string;
selected_category: string;
mode: number;
init_directions: DirectionsAllowed;
- // Static
- paint_colors: Colors;
};
export const ColorItem = (props) => {
@@ -168,13 +145,14 @@ const ModeItem = (props) => {
act('mode', {
mode: tool.bitmask,
})
}
- />
+ >
+ {tool.name}
+
))}
);
@@ -201,7 +179,7 @@ const CategoryItem = (props) => {
};
const SelectionSection = (props) => {
- const { act, data } = useBackend();
+ const { data } = useBackend();
const { category: rootCategoryIndex } = data;
return (
@@ -217,37 +195,46 @@ const SelectionSection = (props) => {
const LayerSelect = (props) => {
const { act, data } = useBackend();
- const { pipe_layers } = data;
- const { multi_layer } = data;
+ const { pipe_layers, multi_layer, max_pipe_layers } = data;
+ const layer_to_bitmask = (layer: number) => {
+ return 1 << layer;
+ };
+
return (
- {LAYERS.map((layer) => (
- act('pipe_layers', { pipe_layers: layer.bitmask })}
- />
- ))}
+ {Array(max_pipe_layers)
+ .keys()
+ .map((layer) => (
+
+ act('pipe_layers', { pipe_layers: layer_to_bitmask(layer) })
+ }
+ >
+ {layer + 1}
+
+ ))}
{
act('toggle_multi_layer');
}}
- />
+ >
+ Multi
+
);
};
const PreviewSelect = (props) => {
- const { act, data } = useBackend();
+ const { act } = useBackend();
return (
{props.previews.map((preview) => (
@@ -288,8 +275,8 @@ const PreviewSelect = (props) => {
};
const PipeTypeSection = (props) => {
- const { act, data } = useBackend();
- const { categories = [], selected_category, selected_recipe } = data;
+ const { data } = useBackend();
+ const { categories = [], selected_category } = data;
const [categoryName, setCategoryName] = useState(selected_category);
const shownCategory =
categories.find((category) => category.cat_name === categoryName) ||
@@ -411,7 +398,7 @@ export const SmartPipeBlockSection = (props) => {
};
export const RapidPipeDispenser = (props) => {
- const { act, data } = useBackend();
+ const { data } = useBackend();
const { category: rootCategoryIndex } = data;
return (
diff --git a/tgui/packages/tgui/interfaces/TurbineComputer.tsx b/tgui/packages/tgui/interfaces/TurbineComputer.tsx
index 4d1305b88b5c8..f67a09f2687a8 100644
--- a/tgui/packages/tgui/interfaces/TurbineComputer.tsx
+++ b/tgui/packages/tgui/interfaces/TurbineComputer.tsx
@@ -9,7 +9,9 @@ import {
NumberInput,
ProgressBar,
Section,
+ Stack,
} from '../components';
+import { formatPower } from '../format';
import { Window } from '../layouts';
type TurbineInfo = {
@@ -19,105 +21,99 @@ type TurbineInfo = {
power: number;
temp: number;
integrity: number;
- parts_linked: BooleanLike;
- parts_ready: BooleanLike;
max_rpm: number;
max_temperature: number;
regulator: number;
};
-export const TurbineComputer = (props) => {
+const TurbineDisplay = (props) => {
const { act, data } = useBackend();
- const parts_not_connected = !data.parts_linked && (
-
-
- {
- 'Parts not connected, use a multitool on the core rotor before trying again'
- }
-
-
+
+ return (
+ = 1000)}
+ onClick={() => act('toggle_power')}
+ >
+ {data.active ? 'Online' : 'Offline'}
+
+ }
+ >
+
+
+
+ act('regulate', {
+ regulate: value * 0.01,
+ })
+ }
+ />
+
+
+
+
+
+ {data.rpm} RPM
+
+
+ {data.max_rpm} RPM
+
+
+ {data.temp} K
+
+
+ {data.max_temperature} K
+
+
+ {formatPower(data.power)}
+
+
+
);
- const parts_not_ready = data.parts_linked && !data.parts_ready && (
+};
+
+const OutOfService = (props) => {
+ return (
-
- {
- 'Some parts have open maintenance hatchet, please close them before starting'
- }
-
+
+
+
+ {
+ 'Parts not connected, close all mantainence panels/use a multitool on the rotor before trying again'
+ }
+
+
+
);
+};
+
+export const TurbineComputer = (props) => {
+ const { data } = useBackend();
+
return (
- = 1000) || !data.parts_linked}
- onClick={() => act('toggle_power')}
- />
- }
- >
- {parts_not_connected}
- {parts_not_ready}
-
-
-
- act('regulate', {
- regulate: value * 0.01,
- })
- }
- />
-
-
-
-
-
- {data.rpm} RPM
-
-
- {data.max_rpm} RPM
-
-
- {data.temp} K
-
-
- {data.max_temperature} K
-
-
- {data.power * 4 * 0.001} kW
-
-
-
+ {data.connected ? : }
);
diff --git a/tools/UpdatePaths/Scripts/repaths_a357_to_c357.txt b/tools/UpdatePaths/Scripts/repaths_a357_to_c357.txt
new file mode 100644
index 0000000000000..28ad97efff1ab
--- /dev/null
+++ b/tools/UpdatePaths/Scripts/repaths_a357_to_c357.txt
@@ -0,0 +1,3 @@
+#comment Repaths instances of a357 with c357, so as to acknowledge that it is consistent with other casings.
+
+/obj/item/ammo_casing/c357 : /obj/item/ammo_casing/a357{@OLD}
diff --git a/tools/ci/ci_config.txt b/tools/ci/ci_config.txt
index 51e08e6328ba1..1e6f19eb692c9 100644
--- a/tools/ci/ci_config.txt
+++ b/tools/ci/ci_config.txt
@@ -5,6 +5,4 @@ FEEDBACK_DATABASE tg_ci
FEEDBACK_TABLEPREFIX
FEEDBACK_LOGIN root
FEEDBACK_PASSWORD
-LAVALAND_BUDGET 0
-SPACE_BUDGET 0
AUXTOOLS_ENABLED