Merge branch 'dev-sierra' into IPC-organ

SierraBay · Jan 7, 2024 · 8e65257 · 8e65257
2 parents 23640b0 + a779b2c
commit 8e65257
Show file tree

Hide file tree

Showing 45 changed files with 3,358 additions and 111 deletions.
diff --git a/code/game/jobs/job/job.dm b/code/game/jobs/job/job.dm
@@ -5,8 +5,8 @@
 	var/list/access = list()              // The job's default access tokens
 	var/list/software_on_spawn = list()   // Defines the software files that spawn on tablets and labtops
 	var/department_flag = 0
-	var/total_positions = 0               // How many players can be this job
-	var/spawn_positions = 0               // How many players can spawn in as this job
+	var/total_positions = 0               // How many players can be this job. Set to -1 for unlimited.
+	var/spawn_positions = 0               // How many players can spawn in as this job. Set to -1 for unlimited.
 	var/current_positions = 0             // How many players have this job
 	var/availablity_chance = 100          // Percentage chance job is available each round
 

diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm
@@ -355,7 +355,10 @@
 			new_color = COLOR_SUN
 		if (2)
 			new_color = COLOR_RED_LIGHT
-	AddOverlays(overlay_image(icon, "alarm[icon_level]", plane = EFFECTS_ABOVE_LIGHTING_PLANE, layer = ABOVE_LIGHTING_LAYER))
+	AddOverlays(list(
+		emissive_appearance(icon, "alarm[icon_level]"),
+		image(icon, "alarm[icon_level]")
+	))
 
 	pixel_x = 0
 	pixel_y = 0

diff --git a/code/game/machinery/body_scanner_console.dm b/code/game/machinery/body_scanner_console.dm
@@ -27,7 +27,7 @@
 	ClearOverlays()
 	if(panel_open)
 		AddOverlays("[icon_state]_panel")
-	if(!connected.inoperable())
+	if(!connected?.inoperable())
 		AddOverlays(emissive_appearance(icon, "[icon_state]_lights"))
 		AddOverlays("[icon_state]_lights")
 

diff --git a/code/game/machinery/lightswitch.dm b/code/game/machinery/lightswitch.dm
@@ -12,7 +12,6 @@
 	var/on = 0
 	var/area/connected_area = null
 	var/other_area = null
-	var/image/overlay
 
 /obj/machinery/light_switch/Initialize()
 	. = ..()
@@ -28,20 +27,18 @@
 	update_icon()
 
 /obj/machinery/light_switch/on_update_icon()
-	if(!overlay)
-		overlay = image(icon, "light1-overlay")
-		overlay.plane = EFFECTS_ABOVE_LIGHTING_PLANE
-		overlay.layer = ABOVE_LIGHTING_LAYER
-
 	ClearOverlays()
 	if(inoperable())
 		icon_state = "light-p"
 		set_light(0)
 	else
 		icon_state = "light[on]"
-		overlay.icon_state = "light[on]-overlay"
-		AddOverlays(overlay)
-		set_light(2, 0.25, on ? "#82ff4c" : "#f86060")
+		var/color = on ? "#82ff4c" : "#f86060"
+		AddOverlays(list(
+			emissive_appearance(icon, "light[on]-overlay"),
+			overlay_image(icon, "light[on]-overlay", color)
+		))
+		set_light(2, 0.25, color)
 
 /obj/machinery/light_switch/examine(mob/user, distance)
 	. = ..()

diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm
@@ -41,7 +41,7 @@ Buildable meters
 
 //called when a turf is attacked with a pipe item
 /obj/item/pipe/use_after(atom/target, mob/living/user, click_parameters)
-	if (istype(target))
+	if (istype(target, /turf/simulated/floor))
 		user.unEquip(src, target)
 		return TRUE
 

diff --git a/code/game/machinery/status_display.dm b/code/game/machinery/status_display.dm
@@ -17,6 +17,8 @@
 	anchored = TRUE
 	density = FALSE
 	idle_power_usage = 10
+	health_max = 10
+	damage_hitsound = 'sound/effects/Glasshit.ogg'
 	var/mode = 1	// 0 = Blank
 					// 1 = Shuttle timer
 					// 2 = Arbitrary message(s)
@@ -54,6 +56,37 @@
 		radio_controller.remove_object(src,frequency)
 	return ..()
 
+/obj/machinery/status_display/on_death()
+	..()
+	playsound(src, "shatter", 70, 1)
+	visible_message(SPAN_DANGER("\The [src] is smashed into many pieces!"))
+	remove_display()
+	STOP_PROCESSING_MACHINE(src, MACHINERY_PROCESS_SELF)
+
+/obj/machinery/status_display/on_revive()
+	..()
+	START_PROCESSING_MACHINE(src, MACHINERY_PROCESS_SELF)
+
+/obj/machinery/status_display/on_update_icon()
+	if (MACHINE_IS_BROKEN(src))
+		icon_state = "[initial(icon_state)]_broken"
+	else
+		icon_state = "[initial(icon_state)]"
+
+/obj/machinery/status_display/use_tool(obj/item/tool, mob/living/user, list/click_params)
+	if (istype(tool, /obj/item/stack/material) && tool.get_material_name() == MATERIAL_GLASS && health_damaged())
+		var/obj/item/stack/mats = tool
+		if (!mats.can_use(2))
+			USE_FEEDBACK_STACK_NOT_ENOUGH(mats, 2, "repair \the [src].")
+			return TRUE
+		if (!user.do_skilled(4 SECONDS, SKILL_CONSTRUCTION, src, do_flags = DO_REPAIR_CONSTRUCT) || !user.use_sanity_check(src, tool))
+			return TRUE
+		mats.use(2)
+		to_chat(user, SPAN_NOTICE("You repair the broken glass on \the [src]."))
+		revive_health()
+		return TRUE
+	return ..()
+
 // register for radio system
 /obj/machinery/status_display/Initialize()
 	. = ..()
@@ -62,6 +95,8 @@
 
 // timed process
 /obj/machinery/status_display/Process()
+	if (MACHINE_IS_BROKEN(src))
+		return PROCESS_KILL
 	if(!is_powered())
 		remove_display()
 		return
@@ -77,6 +112,8 @@
 // set what is displayed
 /obj/machinery/status_display/proc/update()
 	remove_display()
+	if (MACHINE_IS_BROKEN(src))
+		return
 	if(friendc && !ignore_friendc)
 		set_picture("ai_friend")
 		if(status_display_show_alert_border)

diff --git a/code/game/objects/items/weapons/shields.dm b/code/game/objects/items/weapons/shields.dm
@@ -235,12 +235,13 @@
 		force = initial(force)
 		w_class = initial(w_class)
 
+	update_icon()
+
 	if (istype(user,/mob/living/carbon/human))
 		var/mob/living/carbon/human/H = user
 		H.update_inv_l_hand()
 		H.update_inv_r_hand()
 
-	update_icon()
 	addtimer(new Callback(src, /obj/item/shield/energy/proc/UpdateSoundLoop), 0.1 SECONDS)
 
 

diff --git a/code/game/turfs/simulated/wall_types.dm b/code/game/turfs/simulated/wall_types.dm
@@ -133,7 +133,7 @@
 /turf/simulated/wall/silvergold/New(newloc)
 	..(newloc,MATERIAL_SILVER,MATERIAL_GOLD)
 
-/turf/simulated/wall/sandstonediamond/New(newloc)
+/turf/simulated/wall/sandstone/diamond/New(newloc)
 	..(newloc,MATERIAL_SANDSTONE,MATERIAL_DIAMOND)
 
 /turf/simulated/wall/crystal/New(newloc)

diff --git a/code/modules/atmospherics/pipes.dm b/code/modules/atmospherics/pipes.dm
@@ -102,6 +102,10 @@
 	. = ..()
 
 /obj/machinery/atmospherics/pipe/use_tool(obj/item/W, mob/living/user, list/click_params)
+	if (istype(W, /obj/item/pipe))
+		user.unEquip(W, loc)
+		return TRUE
+
 	if (!isWrench(W))
 		return ..()
 

diff --git a/code/modules/clothing/spacesuits/rig/modules/combat.dm b/code/modules/clothing/spacesuits/rig/modules/combat.dm
@@ -67,7 +67,7 @@
 	if(!target.Adjacent(holder.wearer) || !ismob(target))
 		return 0
 
-	var/resolved = target.attackby(device,holder.wearer)
+	var/resolved = device.resolve_attackby(target,holder.wearer)
 	if(resolved)
 		holder.cell.use(use_power_cost * CELLRATE)
 	return resolved

diff --git a/code/modules/mechs/premade/_premade.dm b/code/modules/mechs/premade/_premade.dm
@@ -151,7 +151,7 @@
 /mob/living/exosuit/premade/random/normal
 
 /mob/living/exosuit/premade/random/boring/Initialize(mapload, obj/structure/heavy_vehicle_frame/source_frame)
-	..(mapload, source_frame, using_boring_colours = TRUE)
+	return..(mapload, source_frame, using_boring_colours = TRUE)
 
 /mob/living/exosuit/premade/random/extra/Initialize(mapload, obj/structure/heavy_vehicle_frame/source_frame)
-	..(mapload, source_frame, super_random = TRUE)
+	return..(mapload, source_frame, super_random = TRUE)
diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm
@@ -297,12 +297,9 @@
 			on = FALSE
 
 	if(istype(lightbulb, /obj/item/light))
-		var/image/I = image(icon, src, _state)
-		I.color = get_mode_color()
 		if (on)
-			I.plane = EFFECTS_ABOVE_LIGHTING_PLANE
-			I.layer = ABOVE_LIGHTING_LAYER
-		AddOverlays(I)
+			AddOverlays(emissive_appearance(icon, _state))
+		AddOverlays(overlay_image(icon, _state, color))
 
 	if(on)
 

diff --git a/code/modules/projectiles/guns/energy/nuclear.dm b/code/modules/projectiles/guns/energy/nuclear.dm
@@ -23,7 +23,7 @@
 	w_class = ITEM_SIZE_NORMAL
 	slot_flags = SLOT_BELT|SLOT_HOLSTER
 	icon = 'icons/obj/guns/skrell_pistol.dmi'
-	icon_state = "skrell_pistol_stun_100"
+	icon_state = "skrell_pistol_stun100"
 	max_shots = 10
 	fire_delay = 6
 	one_hand_penalty = 1

diff --git a/html/changelog.html b/html/changelog.html
@@ -28,6 +28,13 @@ <h2>Sierra SS13</h2>
 		-->
 		<div class="changelog">
 
+			<h2 class="date">07.01 - 2024</h2>
+			<h3 class="author">Обновления Mucker:</h3>
+			<div class="changes bgimages16">
+				<div class="log tweak">Removed Bearcat's holopad and distress beacon. Added a radio beacon circuit board and a RCD.</div>
+				<div class="log tweak">Reduced Survival Pod's spawn rate so Exploration isn't constantly stuck doing rescues.</div>
+			</div>
+
 			<h2 class="date">06.01 - 2024</h2>
 			<h3 class="author">Обновления LordNest:</h3>
 			<div class="changes bgimages16">
@@ -543,13 +550,6 @@ <h3 class="author">Обновления rootoo807:</h3>
 			<div class="changes bgimages16">
 				<div class="log bugfix">Adds some missing icons for clothing on Unathi, including bandanas.</div>
 			</div>
-
-			<h2 class="date">05.11 - 2023</h2>
-			<h3 class="author">Обновления LordNest:</h3>
-			<div class="changes bgimages16">
-				<div class="log bugfix">Пофиксил невозможность захода на патрули</div>
-				<div class="log maptweak">Различные исправления авей-карт</div>
-			</div>
 	</div></div>
 	<div class="icons-by">Icons by <a target="_blank" href="https://icons8.com">Icons8</a></div>
 </body></html>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
@@ -22904,3 +22904,9 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY sierra_genchangelog.p
 2024-01-06:
   LordNest:
   - bugfix: Fixed some missing sprites
+2024-01-07:
+  Mucker:
+  - tweak: Removed Bearcat's holopad and distress beacon. Added a radio beacon circuit
+      board and a RCD.
+  - tweak: Reduced Survival Pod's spawn rate so Exploration isn't constantly stuck
+      doing rescues.
diff --git a/html/changelogs/AutoChangeLog-sierra-pr-1772.yml b/html/changelogs/AutoChangeLog-sierra-pr-1772.yml
diff --git a/html/changelogs/AutoChangeLog-sierra-pr-1774.yml b/html/changelogs/AutoChangeLog-sierra-pr-1774.yml
@@ -0,0 +1,5 @@
+author: SierraKomodo
+changes:
+  - {tweak: Punitelli now spawns in various random rooms instead of in maintenance
+      and other dangerous places.}
+delete-after: true
diff --git a/html/changelogs/AutoChangeLog-sierra-pr-1776.yml b/html/changelogs/AutoChangeLog-sierra-pr-1776.yml
@@ -0,0 +1,5 @@
+author: SierraKomodo
+changes:
+  - {bugfix: On-mob sprites for energy shields now properly update when the shield
+      turns off.}
+delete-after: true
diff --git a/html/changelogs/AutoChangeLog-sierra-pr-1777.yml b/html/changelogs/AutoChangeLog-sierra-pr-1777.yml
@@ -0,0 +1,5 @@
+author: emmanuelbassil
+changes:
+  - {bugfix: Fixes in-hand pipes disappearing when clicking on anchored down pipes.}
+  - {bugfix: Hardsuit mounted flash works properly again}
+delete-after: true
diff --git a/html/changelogs/AutoChangeLog-sierra-pr-1778.yml b/html/changelogs/AutoChangeLog-sierra-pr-1778.yml
@@ -0,0 +1,4 @@
+author: SierraKomodo
+changes:
+  - {tweak: 'Lights, switches, and air alarms now use emissive overlays.'}
+delete-after: true
diff --git a/html/changelogs/AutoChangeLog-sierra-pr-1779.yml b/html/changelogs/AutoChangeLog-sierra-pr-1779.yml
@@ -0,0 +1,5 @@
+author: LordNest
+changes:
+  - {maptweak: Added some new templates for exoplanets}
+  - {bugfix: Fixed skrellian pistol sprite and sandstone wall sprite}
+delete-after: true
diff --git a/html/changelogs/AutoChangeLog-sierra-pr-1780.yml b/html/changelogs/AutoChangeLog-sierra-pr-1780.yml
@@ -0,0 +1,5 @@
+author: SierraKomodo
+changes:
+  - {tweak: 'The passenger role now has unlimited slots. (Это на Торче, так что не
+      расслабляйтесь, Сьерровцы)'}
+delete-after: true
diff --git a/html/changelogs/AutoChangeLog-sierra-pr-1781.yml b/html/changelogs/AutoChangeLog-sierra-pr-1781.yml
@@ -0,0 +1,5 @@
+author: emmanuelbassil
+changes:
+  - {tweak: Status displays are now destructible.}
+  - {tweak: Can repair destroyed status displays with two sheets of glass.}
+delete-after: true
diff --git a/icons/obj/machines/status_display.dmi b/icons/obj/machines/status_display.dmi
diff --git a/maps/_maps.dm b/maps/_maps.dm
@@ -24,11 +24,13 @@ GLOBAL_DATUM_INIT(using_map, /datum/map, new using_map_DATUM)
 #include "away\away_sites.dm"
 #include "away_sites_testing\away_sites_testing_define.dm"
 #include "random_ruins\exoplanet_ruins\exoplanet_ruins.dm"
+#include "random_ruins\exoplanet_ruins\excavation_site\excavation_site.dm"
 #include "random_ruins\exoplanet_ruins\transshipment\transshipment.dm"
 #include "random_ruins\exoplanet_ruins\crashed_pod\crashed_pod.dm"
 #include "random_ruins\exoplanet_ruins\datacapsule\datacapsule.dm"
 #include "random_ruins\exoplanet_ruins\deserted_lab\deserted_lab.dm"
 #include "random_ruins\exoplanet_ruins\drill_site\drill_site.dm"
+#include "random_ruins\exoplanet_ruins\droppod\droppod.dm"
 #include "random_ruins\exoplanet_ruins\fountain\fountain_ruin.dm"
 #include "random_ruins\exoplanet_ruins\hut\hut.dm"
 #include "random_ruins\exoplanet_ruins\hydrobase\hydrobase.dm"
@@ -47,4 +49,6 @@ GLOBAL_DATUM_INIT(using_map, /datum/map, new using_map_DATUM)
 #include "random_ruins\exoplanet_ruins\tar_anomaly\tar_anomaly.dm"
 #include "random_ruins\exoplanet_ruins\trash_heap\trash_heap.dm"
 #include "random_ruins\exoplanet_ruins\crashed_probe\crashed_probe.dm"
+#include "random_ruins\exoplanet_ruins\crashed_shuttle\crashed_shuttle.dm"
+#include "random_ruins\exoplanet_ruins\skrell_biodome\skrell_biodome.dm"
 #include "random_ruins\space_ruins\space_ruins.dm"
diff --git a/maps/random_ruins/exoplanet_ruins/crashed_shuttle/crashed_shuttle.dm b/maps/random_ruins/exoplanet_ruins/crashed_shuttle/crashed_shuttle.dm
@@ -0,0 +1,53 @@
+/datum/map_template/ruin/exoplanet/crashed_shuttle
+	name = "Crushed shuttle"
+	id = "crashed_shuttle"
+	description = "Crushed corporate shuttle."
+	suffixes = list("crashed_shuttle/crashed_shuttle.dmm")
+	spawn_cost = 0.5
+	shuttles_to_initialise = list(/datum/shuttle/autodock/overmap/graysontug)
+	apc_test_exempt_areas = list(/area/map_template/crashed_shuttle/crash = NO_SCRUBBER|NO_VENT|NO_APC)
+	ruin_tags = RUIN_HUMAN|RUIN_WRECK
+	template_flags = TEMPLATE_FLAG_CLEAR_CONTENTS | TEMPLATE_FLAG_NO_RUINS
+
+	skip_main_unit_tests = "Ruin has shuttle landmark."
+
+/area/map_template/crashed_shuttle/graysontug
+	name = "\improper GM Tug"
+	icon_state = "shuttlegrn"
+
+/area/map_template/crashed_shuttle/crash
+	name = "\improper Crash zone"
+	icon_state = "shuttle2"
+	area_flags = AREA_FLAG_EXTERNAL
+
+/datum/shuttle/autodock/overmap/graysontug
+	name = "GM Tug"
+	dock_target = "graysontug_shuttle"
+	current_location = "nav_graysontug_start"
+	range = 1
+	shuttle_area = /area/map_template/crashed_shuttle/graysontug
+	fuel_consumption = 4
+	defer_initialisation = TRUE
+	flags = SHUTTLE_FLAGS_PROCESS
+	skill_needed = SKILL_MIN
+	ceiling_type = /turf/simulated/floor/shuttle_ceiling
+
+/obj/machinery/computer/shuttle_control/explore/graysontug
+	name = "GM Tug Shuttle control console"
+	shuttle_tag = "GM Tug"
+
+/obj/overmap/visitable/ship/landable/graysontug
+	name = "GM Tug"
+	desc = "Grayson Manufactories Tug. Space truckin commonly seen across Frontier."
+	shuttle = "GM Tug"
+	fore_dir = NORTH
+	color = "#e6f7ff"
+	vessel_mass = 2500
+	vessel_size = SHIP_SIZE_TINY
+
+/obj/shuttle_landmark/graysontug/start
+	name = "Crash Zone"
+	landmark_tag = "nav_graysontug_start"
+	base_area = /area/map_template/crashed_shuttle/crash
+	base_turf = /turf/simulated/floor/exoplanet/barren
+	movable_flags = MOVABLE_FLAG_EFFECTMOVE