Merge pull request #2305 from DS-13-Dev-Team/revert-2304-revert-2303-…

…revert-2302-revert-2301-dev Revert "Revert "Revert "Revert "shit""""
DS-13-Dev-Team · Dec 23, 2023 · 1751066 · 1751066
2 parents 0d8c4c0 + 7bf6dbf
commit 1751066
Show file tree

Hide file tree

Showing 70 changed files with 1,065 additions and 1,227 deletions.
diff --git a/baystation12.dme b/baystation12.dme
@@ -1663,26 +1663,19 @@
 #include "code\modules\clothing\spacesuits\rig\suits\cseco.dm"
 #include "code\modules\clothing\spacesuits\rig\suits\engineering.dm"
 #include "code\modules\clothing\spacesuits\rig\suits\ert.dm"
-#include "code\modules\clothing\spacesuits\rig\suits\excavation.dm"
 #include "code\modules\clothing\spacesuits\rig\suits\firesuit.dm"
-#include "code\modules\clothing\spacesuits\rig\suits\flesh.dm"
 #include "code\modules\clothing\spacesuits\rig\suits\hacker.dm"
 #include "code\modules\clothing\spacesuits\rig\suits\light.dm"
 #include "code\modules\clothing\spacesuits\rig\suits\marine.dm"
 #include "code\modules\clothing\spacesuits\rig\suits\marksman.dm"
 #include "code\modules\clothing\spacesuits\rig\suits\merc.dm"
 #include "code\modules\clothing\spacesuits\rig\suits\mining.dm"
-#include "code\modules\clothing\spacesuits\rig\suits\patrol.dm"
-#include "code\modules\clothing\spacesuits\rig\suits\riot.dm"
 #include "code\modules\clothing\spacesuits\rig\suits\scaf.dm"
-#include "code\modules\clothing\spacesuits\rig\suits\sea.dm"
 #include "code\modules\clothing\spacesuits\rig\suits\security.dm"
 #include "code\modules\clothing\spacesuits\rig\suits\specialforces.dm"
 #include "code\modules\clothing\spacesuits\rig\suits\station.dm"
-#include "code\modules\clothing\spacesuits\rig\suits\tarnished.dm"
 #include "code\modules\clothing\spacesuits\rig\suits\unitologist.dm"
 #include "code\modules\clothing\spacesuits\rig\suits\vintage.dm"
-#include "code\modules\clothing\spacesuits\rig\suits\wasp.dm"
 #include "code\modules\clothing\spacesuits\void\merc.dm"
 #include "code\modules\clothing\spacesuits\void\misc.dm"
 #include "code\modules\clothing\spacesuits\void\station.dm"

diff --git a/code/datums/craft/recipes/rig.dm b/code/datums/craft/recipes/rig.dm
@@ -14,6 +14,28 @@
 	list(CRAFT_TOOL, QUALITY_WIRE_CUTTING, 10, WORKTIME_NORMAL, FAILCHANCE_NORMAL, SKILL_ELECTRICAL)
 	)
 
+/datum/craft_recipe/rig/intermediate
+	name = "Intermediate Engineering RIG"
+	desc = "Upgrade a Standard Engineering RIG into a Intermediate Engineering RIG"
+	time = 50
+	result = /obj/item/rig/intermediate
+	steps = list(
+	list(CRAFT_OBJECT, /obj/item/rig/engineering),
+	list(CRAFT_STACK, /obj/item/stack/power_node, 3),
+	list(CRAFT_TOOL, QUALITY_WIRE_CUTTING, 10, WORKTIME_NORMAL, FAILCHANCE_NORMAL, SKILL_ELECTRICAL)
+	)
+
+/datum/craft_recipe/rig/excavation
+	name = "Intermediate Mining RIG"
+	desc = "Upgrade a Standard Mining RIG into a Intermediate Mining RIG"
+	time = 50
+	result = /obj/item/rig/excavation
+	steps = list(
+	list(CRAFT_OBJECT, /obj/item/rig/mining),
+	list(CRAFT_STACK, /obj/item/stack/power_node, 3),
+	list(CRAFT_TOOL, QUALITY_WIRE_CUTTING, 10, WORKTIME_NORMAL, FAILCHANCE_NORMAL, SKILL_ELECTRICAL)
+	)
+
 /datum/craft_recipe/rig/flesh
 	name = "Odd RIG"
 	desc = "Upgrade a zealot rig into a odd rig"

diff --git a/code/datums/craft/recipes/weapon.dm b/code/datums/craft/recipes/weapon.dm
@@ -4,6 +4,15 @@
 
 	icon_state = "gun"
 
+/datum/craft_recipe/weapon/unitologist
+	name = "unitology ritual blade"
+	result = /obj/item/material/knife/unitologist
+	steps = list(
+		list(CRAFT_OBJECT, /obj/item/material/knife)
+	)
+
+
+
 /datum/craft_recipe/weapon/baseballbat
 	name = "baseball bat"
 	result = /obj/item/material/twohanded/baseballbat
@@ -189,6 +198,7 @@
 /datum/craft_recipe/weapon/rendingcutter
 	name = "Rending Cutter"
 	result = /obj/item/gun/energy/cutter/rending
+	flags = CRAFT_ON_WORKBENCH
 	time = 200
 	steps = list(
 	list(CRAFT_OBJECT, /obj/item/gun/energy/cutter/plasma, WORKTIME_NORMAL, FALSE, /obj/item/gun/energy/cutter/rending),
@@ -198,6 +208,7 @@
 /datum/craft_recipe/weapon/rendingdivet
 	name = "Rending Divet"
 	result = /obj/item/gun/projectile/divet/rending
+	flags = CRAFT_ON_WORKBENCH
 	time = 200
 	steps = list(
 	list(CRAFT_OBJECT, /obj/item/gun/projectile/divet, WORKTIME_NORMAL, FALSE, /obj/item/gun/projectile/divet/rending),

diff --git a/code/datums/supplypacks/security.dm b/code/datums/supplypacks/security.dm
@@ -167,7 +167,7 @@
 
 /decl/hierarchy/supply_pack/security/rig_security
 	name = "T2 RIG - Security"
-	contains = list(/obj/item/rig/security = 1)
+	contains = list(/obj/item/rig/pcsi/security = 1)
 	cost = 150
 	containertype = /obj/structure/closet/crate/secure/large
 	containername = "\improper security RIG crate"
@@ -176,7 +176,7 @@
 
 /decl/hierarchy/supply_pack/security/rig_patrol
 	name = "T2 RIG - Patrol"
-	contains = list(/obj/item/rig/patrol = 1)
+	contains = list(/obj/item/rig/riot/patrol = 1)
 	cost = 150
 	containertype = /obj/structure/closet/crate/secure/large
 	containername = "\improper patrol RIG crate"

diff --git a/code/datums/uplink/medical.dm b/code/datums/uplink/medical.dm
@@ -23,7 +23,7 @@
 
 /datum/uplink_item/item/medical/medigel_small
 	name = "small medical gel injector"
-	item_cost = 8
+	item_cost = 6
 	path = /obj/item/reagent_containers/hypospray/autoinjector/ds_medigel/small
 	is_special = TRUE
 	antag_roles = list(MODE_EARTHGOV_AGENT, MODE_UNITOLOGIST, MODE_UNITOLOGIST_SHARD)
diff --git a/code/game/jobs/job/cargo.dm b/code/game/jobs/job/cargo.dm
@@ -67,8 +67,8 @@
 	department = "Supply"
 	abbreviation = "ST"
 	department_flag = SUP
-	total_positions = 15
-	spawn_positions = 15
+	total_positions = 3
+	spawn_positions = 3
 	supervisors = "the Supply Officer"
 	selection_color = "#3b3b3b"
 	minimal_player_age = 18

diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/civilian.dm
@@ -31,8 +31,8 @@
 	title = "Line Cook"
 	abbreviation = "LC"
 	department_flag = SRV
-	total_positions = 7
-	spawn_positions = 7
+	total_positions = 2
+	spawn_positions = 2
 	supervisors = "the First Lieutenant"
 	selection_color = "#006200"
 	minimal_player_age = 18
@@ -60,8 +60,8 @@
 	title = "Botanist"
 	abbreviation = "BOT"
 	department_flag = SRV
-	total_positions = 6
-	spawn_positions = 6
+	total_positions = 2
+	spawn_positions = 2
 	supervisors = "the First Lieutenant"
 	selection_color = "#006200"
 	minimal_player_age = 18
@@ -88,8 +88,8 @@
 	title = "Janitor"
 	abbreviation = "JTR"
 	department_flag = SRV
-	total_positions = 20
-	spawn_positions = 20
+	total_positions = 3
+	spawn_positions = 3
 	supervisors = "the First Lieutenant"
 	selection_color = "#6c0864"
 	minimal_player_age = 18

diff --git a/code/game/jobs/job/ishimura/medical.dm b/code/game/jobs/job/ishimura/medical.dm
@@ -41,8 +41,8 @@
 	department = "Medical"
 	abbreviation = "MD"
 	department_flag = MED
-	total_positions = 6
-	spawn_positions = 6
+	total_positions = 5
+	spawn_positions = 5
 	supervisors = "the Senior Medical Officer"
 	selection_color = "#013d3b"
 	minimal_player_age = 18

diff --git a/code/game/jobs/job/ishimura/mining.dm b/code/game/jobs/job/ishimura/mining.dm
@@ -77,7 +77,7 @@
 	abbreviation = "PC"
 	department = "Mining"
 	department_flag = MIN
-	total_positions = 25
+	total_positions = 100
 	spawn_positions = 25
 	supervisors = "the Mining Foreman"
 	selection_color = "#5e4215"

diff --git a/code/game/jobs/job/ishimura/security.dm b/code/game/jobs/job/ishimura/security.dm
@@ -41,8 +41,8 @@
 	department = "Security"
 	abbreviation = "SSO"
 	department_flag = SEC
-	total_positions = 1
-	spawn_positions = 1
+	total_positions = 2
+	spawn_positions = 2
 	supervisors = "the Chief Security Officer"
 	selection_color = "#601c1c"
 	minimal_player_age = 18
@@ -72,8 +72,8 @@
 	department = "Security"
 	abbreviation = "SEC"
 	department_flag = SEC
-	total_positions = 4
-	spawn_positions = 4
+	total_positions = 15
+	spawn_positions = 15
 	supervisors = "the Chief Security Officer and Senior Security Officer"
 	selection_color = "#601c1c"
 	minimal_player_age = 18

diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm
@@ -42,8 +42,8 @@
 	department = "Medical"
 	abbreviation = "MD"
 	department_flag = MED
-	total_positions = 15
-	spawn_positions = 15
+	total_positions = 5
+	spawn_positions = 5
 	supervisors = "the Senior Medical Officer"
 	selection_color = "#013d3b"
 	minimal_player_age = 18
@@ -74,8 +74,8 @@
 	department = "Medical"
 	abbreviation = "SRG"
 	department_flag = MED
-	total_positions = 5
-	spawn_positions = 5
+	total_positions = 2
+	spawn_positions = 2
 	supervisors = "the Senior Medical Officer"
 	selection_color = "#013d3b"
 	minimal_player_age = 18

diff --git a/code/game/jobs/job/science.dm b/code/game/jobs/job/science.dm
@@ -45,8 +45,8 @@
 	department = "Science"
 	abbreviation = "RA"
 	department_flag = SCI
-	total_positions = 10
-	spawn_positions = 10
+	total_positions = 4
+	spawn_positions = 4
 	supervisors = "the Chief Science Officer"
 	selection_color = "#633d63"
 	minimal_player_age = 18

diff --git a/code/game/machinery/vending_miner.dm b/code/game/machinery/vending_miner.dm
@@ -47,6 +47,8 @@
 		/obj/item/gun/spray/hydrazine_torch = 10,
 		/obj/item/reagent_containers/glass/fuel_tank/fuel = 25,
 		/obj/item/reagent_containers/glass/fuel_tank/hydrazine = 10,
+		/obj/item/rig/excavation = 10,
+		/obj/item/rig/advanced/mining = 5,
 	)
 	prices = list(
 		/obj/item/stack/power_node = 5000,
@@ -90,6 +92,8 @@
 		/obj/item/gun/spray/hydrazine_torch = 8000,
 		/obj/item/reagent_containers/glass/fuel_tank/fuel = 2000,
 		/obj/item/reagent_containers/glass/fuel_tank/hydrazine = 4000,
+		/obj/item/rig/excavation = 10000,
+		/obj/item/rig/advanced/mining = 20000,
 	)
 
 /obj/machinery/vending/mining/attackby(obj/item/W, mob/user)

diff --git a/code/game/objects/items/stacks/power_node.dm b/code/game/objects/items/stacks/power_node.dm
@@ -1,36 +1,36 @@
-/obj/item/stack/power_node
-	name = "power nodes"
-	desc = "It seems to be radiating a lot of energy."
-	singular_name = "power node"
-	icon = 'icons/obj/tools.dmi'
-	icon_state = "powernode"
-	w_class = ITEM_SIZE_SMALL
-	max_amount = 20
-	item_flags = ITEM_FLAG_NO_BLUDGEON
-	origin_tech = list(TECH_MATERIAL = 6, TECH_BLUESPACE = 4)
-
-/obj/item/stack/special_node
-	name = "cutter nodes"
-	desc = "A power node that seems to have been built to specifically enhance a plasma cutter in a strange manner."
-	singular_name = "cutter node"
-	icon = 'icons/obj/tools.dmi'
-	color = "#e97f83"
-	icon_state = "powernode"
-	w_class = ITEM_SIZE_SMALL
-	max_amount = 20
-	item_flags = ITEM_FLAG_NO_BLUDGEON
-	origin_tech = list(TECH_MATERIAL = 6, TECH_BLUESPACE = 4)
-
-obj/item/stack/special_node/cutter
-
-obj/item/stack/special_node/divet
-	desc = "A power node that seems to have been built to specifically enhance a divet gun in a strange manner."
-	name = "divet nodes"
-	singular_name = "divet node"
-	color = "#6e6ec1"
-
-obj/item/stack/special_node/evil
-	desc = "A strange power note emanating with an evil aura."
-	name = "divet nodes"
-	singular_name = "divet node"
+/obj/item/stack/power_node
+	name = "power nodes"
+	desc = "It seems to be radiating a lot of energy."
+	singular_name = "power node"
+	icon = 'icons/obj/tools.dmi'
+	icon_state = "powernode"
+	w_class = ITEM_SIZE_SMALL
+	max_amount = 20
+	item_flags = ITEM_FLAG_NO_BLUDGEON
+	origin_tech = list(TECH_MATERIAL = 6, TECH_BLUESPACE = 4)
+
+/obj/item/stack/special_node
+	name = "cutter nodes"
+	desc = "A power node that seems to have been built to specifically enhance a plasma cutter in a strange manner."
+	singular_name = "cutter node"
+	icon = 'icons/obj/tools.dmi'
+	color = "#e97f83"
+	icon_state = "powernode"
+	w_class = ITEM_SIZE_SMALL
+	max_amount = 20
+	item_flags = ITEM_FLAG_NO_BLUDGEON
+	origin_tech = list(TECH_MATERIAL = 6, TECH_BLUESPACE = 4)
+
+obj/item/stack/special_node/cutter
+
+obj/item/stack/special_node/divet
+	desc = "A power node that seems to have been built to specifically enhance a divet gun in a strange manner."
+	name = "divet nodes"
+	singular_name = "divet node"
+	color = "#6e6ec1"
+
+obj/item/stack/special_node/evil
+	desc = "A strange power note emanating with an evil aura."
+	name = "evil nodes"
+	singular_name = "evil node"
 	color = "#740909"
diff --git a/code/game/objects/items/weapons/grenades/light.dm b/code/game/objects/items/weapons/grenades/light.dm
@@ -4,16 +4,21 @@
 	icon_state = "lightgrenade"
 	item_state = "flashbang"
 	det_time = 20
-	light_range = 12
+	light_range = 6
 	light_power = 1
 	light_on = FALSE
 
 /obj/item/grenade/light/detonate()
 	..()
 	var/lifetime = rand(2 MINUTES, 4 MINUTES)
-	var/colour = pick("#49f37c", "#fc0f29", "#599dff", "#fa7c0b", "#fef923")
+	var/color = pick("#49f37c", "#fc0f29", "#599dff", "#fa7c0b", "#fef923")
 
 	playsound(src, 'sound/effects/snap.ogg', 80, 1)
 	audible_message("<span class='warning'>\The [src] detonates with a sharp crack!</span>")
-	set_light_color(colour)
+	set_light_color(color)
 	QDEL_IN(src, lifetime)
+
+	if (active)
+		set_light_on(TRUE)
+	else
+		set_light_on(FALSE)
diff --git a/code/game/objects/items/weapons/tools/pickaxe.dm b/code/game/objects/items/weapons/tools/pickaxe.dm
@@ -87,7 +87,7 @@
 	force = WEAPON_FORCE_NORMAL
 	throwforce = WEAPON_FORCE_NORMAL
 	item_state = "ds_rocksaw0"
-	w_class = ITEM_SIZE_HUGE
+	w_class = ITEM_SIZE_NORMAL
 	matter = list(MATERIAL_STEEL = 1200, MATERIAL_PLASTIC = 800)
 	tool_qualities = list()
 	switched_on_qualities = list(QUALITY_DIGGING = 50, QUALITY_DRILLING = 20, QUALITY_EXCAVATION = 15, QUALITY_SAWING = 60, QUALITY_CUTTING = 50)

diff --git a/code/game/objects/random/misc.dm b/code/game/objects/random/misc.dm
@@ -94,9 +94,9 @@ something, make sure it's not in one of the other lists.*/
 
 /obj/random/scaf/item_to_spawn() //total weight = 100
 	return pickweight(list(
-	/obj/item/rig/arctic = 4,
-	/obj/item/rig/scaf/elite = 4,
-	/obj/item/rig/scaf/legionnaire = 4,
+	/obj/item/rig/advanced/arctic = 4,
+	/obj/item/rig/pcsi/elite = 4,
+	/obj/item/rig/pcsi/legionnaire = 4,
 	/obj/item/gun/projectile/automatic/bullpup = 10,
 	/obj/item/ammo_magazine/bullpup = 18,
 	/obj/random/medical = 15,