Merge pull request #6 from silencer-pl/dev

Patch 0 - Cosmetic

Surely merging to master less than 12h before a test run is not a bad idea.

code/controllers/subsystem/statpanel.dm

@@ -25,7 +25,7 @@ SUBSYSTEM_DEF(statpanels)
 		num_fires++
 		global_data = list(
 			"Sector Patrol ALPHA",
-			"UACM Outer Void Primary Supply Terminal, Neroid Sector",
+			"UACM Outer Veil Primary Supply Terminal, Neroid Sector",
 			"August 21st, 2185",
 			"---------",
 //   "Round Time: [ROUND_TIME]",

code/game/gamemodes/game_mode.dm

@@ -132,9 +132,14 @@ GLOBAL_VAR_INIT(cas_tracking_id_increment, 0) //this var used to assign unique t
 /datum/game_mode/proc/announce_ending()
 	if(GLOB.round_statistics)
 		GLOB.round_statistics.track_round_end()
-	log_game("Round end result: [round_finished]")
-	to_chat_spaced(world, margin_top = 2, type = MESSAGE_TYPE_SYSTEM, html = SPAN_ROUNDHEADER("|Round Complete|"))
-	to_chat_spaced(world, type = MESSAGE_TYPE_SYSTEM, html = SPAN_ROUNDBODY("Thus ends the story of the brave men and women of the [MAIN_SHIP_NAME] and their struggle on [SSmapping.configs[GROUND_MAP].map_name].\nThe game-mode was: [GLOB.master_mode]!\n[CONFIG_GET(string/endofroundblurb)]"))
+	log_game("Interval Ended")
+	to_chat(world, narrate_head("Interval Complete"))
+	to_chat(world, narrate_body("The first batch of the UACM Test Crews have arrived at the Outer Veil PST. Guided into their new home, they find and breach a Task Force 14 safehouse."))
+	to_chat(world, narrate_body("Their actions inside trigger a station-wide lockdown and they are ushered back into their rather raw dorms for at least twelve hours."))
+	to_chat(world, narrate_body("The UAS Persephone will arrive on-station in about twelve hours to resolve the lockout, likely with a new batch of recruits."))
+	sleep(50)
+	to_chat(world, narrate_head("The round has concluded. Please remain in character and do not disrupt ongoing roleplay. Do note that unless you specifically want to, nothing that follows this point will be considered in-round canon, but again, do not disrupt any ongoing RP."))
+	to_chat(world, narrate_body("The server will shut down or reset soon. Thank you for playing!"))
 
 /datum/game_mode/proc/declare_completion()
 	if(GLOB.round_statistics)

code/game/objects/items/sectorpatrol/crafting_items.dm

@@ -11,7 +11,7 @@
 //packages
 
 /obj/item/crafting/packages/
-	name = "package master item"
+	name = "package"
 	icon_state = "default"
 	desc = "Brown packaging in the shape of a box. If just looked at, seems like cardboard, but when touched, one would see that it seems way more rigid and seems to be in fact some sort of resin.  Seems like it would be easy to break open, but the process would clearly be one way. A label is visible on one of its corners."
 	desc_lore = "The Northern Republic Production Standard not only dictates screw hole sizes and tube lengths, but also regulates both packaging and labeling of anything adhering to the standard when it is produced. Essentially this means that every NRPS standard complaint wrapping is made of the same brownish artificial resin, meant to be a combination of cardboard and Styrofoam, and always comes with a label oriented towards the bottom-right hand corner of the package. Essentially this means that if you can read the letters, the package is likely upright."
@@ -22,20 +22,51 @@
 	item_serial = "NRPS COMPLIANT<hr>OFFICE STYLE CHAIR, BLACK, ONE<hr>UACM OUTER VEIL PST"
 	item_serial_distance = SERIAL_ITEM_SIZE_FAR
 
+/obj/item/crafting/packages/chair/attack_self(mob/user)
+	. = ..()
+	user.visible_message(SPAN_NOTICE("[user] starts to unwrap a package."), SPAN_INFO("You start to unwrap the pacckage."), SPAN_DANGER("You hear tearing sounds."))
+	if(do_after(user, (CRAFTING_DELAY_NORMAL * user.get_skill_duration_multiplier(SKILL_CONSTRUCTION)), INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD))
+		user.visible_message(SPAN_NOTICE("[user] tears through the package, revealing its contents. Once ripped, the packing material quickly turns to a fine dust."), SPAN_INFO("You tear through the package, revealing its contents. Once ripped, the packing material quickly turns to a fine dust."), SPAN_DANGER("The ripping stops."))
+		new /obj/item/crafting/frame_elements/chair(get_turf(usr))
+		new /obj/item/crafting/top/chair/seat(get_turf(usr))
+		new /obj/item/crafting/top/chair/wheels(get_turf(usr))
+		qdel(src)
+		return
 
 /obj/item/crafting/packages/drawer
 	icon_state = "package_l"
 	w_class = SIZE_LARGE
 	item_serial = "NRPS COMPLIANT<hr>DRAWER CHEST, BLACK, ONE<hr>UACM OUTER VEIL PST"
 	item_serial_distance = SERIAL_ITEM_SIZE_FAR
 
+/obj/item/crafting/packages/drawer/attack_self(mob/user)
+	. = ..()
+	user.visible_message(SPAN_NOTICE("[user] starts to unwrap a package."), SPAN_INFO("You start to unwrap the pacckage."), SPAN_DANGER("You hear tearing sounds."))
+	if(do_after(user, (CRAFTING_DELAY_NORMAL * user.get_skill_duration_multiplier(SKILL_CONSTRUCTION)), INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD))
+		user.visible_message(SPAN_NOTICE("[user] tears through the package, revealing its contents. Once ripped, the packing material quickly turns to a fine dust."), SPAN_INFO("You tear through the package, revealing its contents. Once ripped, the packing material quickly turns to a fine dust."), SPAN_DANGER("The ripping stops."))
+		new /obj/item/crafting/frame_elements/drawers(get_turf(usr))
+		new /obj/item/crafting/top/drawers(get_turf(usr))
+		qdel(src)
+		return
+
 
 /obj/item/crafting/packages/lamp
 	icon_state = "package_m"
 	w_class = SIZE_MEDIUM
 	item_serial = "NRPS COMPLIANT<hr>DESK LAMP, BLACK, ONE<hr>UACM OUTER VEIL PST"
 	item_serial_distance = SERIAL_ITEM_SIZE_MEDIUM
 
+/obj/item/crafting/packages/lamp/attack_self(mob/user)
+	. = ..()
+	user.visible_message(SPAN_NOTICE("[user] starts to unwrap a package."), SPAN_INFO("You start to unwrap the pacckage."), SPAN_DANGER("You hear tearing sounds."))
+	if(do_after(user, (CRAFTING_DELAY_NORMAL * user.get_skill_duration_multiplier(SKILL_CONSTRUCTION)), INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD))
+		user.visible_message(SPAN_NOTICE("[user] tears through the package, revealing its contents. Once ripped, the packing material quickly turns to a fine dust."), SPAN_INFO("You tear through the package, revealing its contents. Once ripped, the packing material quickly turns to a fine dust."), SPAN_DANGER("The ripping stops."))
+		new /obj/item/crafting/frame/lamp(get_turf(usr))
+		new /obj/item/crafting/top/lamp/base(get_turf(usr))
+		new /obj/item/crafting/top/lamp/bulb(get_turf(usr))
+		qdel(src)
+		return
+
 
 // Frames
 
@@ -71,7 +102,7 @@
 
 	if(istype(C, /obj/item/crafting/top/lamp/bulb))
 		if(icon_state == "lamp")
-			var/obj/item/crafting/top/lamp/bulb/bulb
+			var/obj/item/crafting/top/lamp/bulb/bulb = C
 			user.visible_message(SPAN_NOTICE("[user] starts to screw a light bulb into the desk lamp."), SPAN_INFO("You start to screw a light bulb into the desk lamp."))
 			if(do_after(user, (CRAFTING_DELAY_NORMAL * user.get_skill_duration_multiplier(SKILL_CONSTRUCTION)), INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD))
 				var/obj/item/device/modular/lamp/lamp = new(get_turf(src))
@@ -90,7 +121,7 @@
 			if(icon_state == "lamp")
 				user.visible_message(SPAN_NOTICE("[user] starts to detach a lamp top from its frame."), SPAN_INFO("You start to detach a lamp top from its frame."))
 				if(do_after(user, (CRAFTING_DELAY_NORMAL * user.get_skill_duration_multiplier(SKILL_CONSTRUCTION)), INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD))
-					var/obj/item/crafting/top/lamp/base/top
+					var/obj/item/crafting/top/lamp/base/top = new(get_turf(src))
 					top.variant_id = crafting_lamp_top_color
 					user.put_in_hands(top)
 					crafting_lamp_top_color = null
@@ -167,6 +198,7 @@
 					R.variant_id = variant_id
 					R.crafting_chair_wheel_id = W.variant_id
 					qdel(src)
+					qdel(W)
 					return
 	else
 		to_chat(usr, SPAN_NOTICE("There does not seem to be any reason to do that. If you are trying to assemble the frame, start with the wheels."))

code/game/objects/items/storage/toolbox.dm

@@ -96,8 +96,6 @@
 /obj/item/storage/toolbox/uacm/genericengie/fill_preset_inventory()
 	new /obj/item/tool/screwdriver/uacm(src)
 	new /obj/item/tool/wrench/uacm(src)
-	new /obj/item/tool/weldingtool/experimental/uacm(src)
 	new /obj/item/tool/crowbar/uacm(src)
-	new /obj/item/stack/cable_coil/uacm(src,30)
 	new /obj/item/tool/wirecutters/uacm(src)
 	new /obj/item/device/multitool/uacm(src)

code/game/objects/structures/sectorpatrol/crafting/crafting_finished_structures.dm

@@ -206,6 +206,7 @@
 	can_rotate = TRUE
 	opacity = FALSE
 	density = FALSE
+	anchored = FALSE
 
 
 

code/game/objects/structures/sectorpatrol/crafting/crafting_structures.dm

@@ -15,19 +15,64 @@
 	icon_state = "package_xl"
 	desc = "Brown packaging in the shape of a box. If just looked at, seems like cardboard, but when touched, one would see that it seems way more rigid and seems to be in fact some sort of resin.  Seems like it would be easy to break open, but the process would clearly be one way. A label is visible on one of its corners."
 	desc_lore = "The Northern Republic Production Standard not only dictates screw hole sizes and tube lengths, but also regulates both packaging and labeling of anything adhering to the standard when it is produced. Essentially this means that every NRPS standard complaint wrapping is made of the same brownish artificial resin, meant to be a combination of cardboard and Styrofoam, and always comes with a label oriented towards the bottom-right hand corner of the package. Essentially this means that if you can read the letters, the package is likely upright."
+	opacity = FALSE
+	density = TRUE
 
 /obj/structure/crafting/packages/table
 	icon_state = "package_xl"
 	item_serial = "NRPS COMPLIANT<hr>ALL-PURPOSE TABLE, SQUARE, BLACK, ONE<hr>UACM OUTER VEIL PST"
 	item_serial_distance = SERIAL_STRUCTURE_SIZE_FAR
 	variant_id = "default"
 
+/obj/structure/crafting/packages/table/attack_hand(mob/user)
+	user.visible_message(SPAN_NOTICE("[user] starts to unwrap a package."), SPAN_INFO("You start to unwrap the pacckage."), SPAN_DANGER("You hear tearing sounds."))
+	if(do_after(user, (CRAFTING_DELAY_NORMAL * user.get_skill_duration_multiplier(SKILL_CONSTRUCTION)), INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD))
+		user.visible_message(SPAN_NOTICE("[user] tears through the package, revealing its contents. Once ripped, the packing material quickly turns to a fine dust."), SPAN_INFO("You tear through the package, revealing its contents. Once ripped, the packing material quickly turns to a fine dust."), SPAN_DANGER("The ripping stops."))
+		new /obj/item/crafting/frame_elements/table(get_turf(src))
+		new /obj/item/crafting/top/table(get_turf(src))
+		qdel(src)
+		return
+
 /obj/structure/crafting/packages/bed
 	icon_state = "package_long"
 	item_serial = "NRPS COMPLIANT<hr>PLAIN BED AND EXPANDING MATTRESS PACKAGE, COMES WITH ONE (1) STANDARD BED SHEET<hr>UACM OUTER VEIL PST"
 	item_serial_distance = SERIAL_STRUCTURE_SIZE_FAR
 	variant_id = "default"
 
+/obj/structure/crafting/packages/bed/attack_hand(mob/user)
+	user.visible_message(SPAN_NOTICE("[user] starts to unwrap a package."), SPAN_INFO("You start to unwrap the pacckage."), SPAN_DANGER("You hear tearing sounds."))
+	if(do_after(user, (CRAFTING_DELAY_NORMAL * user.get_skill_duration_multiplier(SKILL_CONSTRUCTION)), INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD))
+		user.visible_message(SPAN_NOTICE("[user] tears through the package, revealing its contents. Once ripped, the packing material quickly turns to a fine dust."), SPAN_INFO("You tear through the package, revealing its contents. Once ripped, the packing material quickly turns to a fine dust."), SPAN_DANGER("The ripping stops."))
+		new /obj/item/crafting/frame_elements/bed(get_turf(src))
+		new /obj/item/crafting/top/bed(get_turf(src))
+		qdel(src)
+		return
+
+
+/obj/structure/crafting/packages/dormstruts
+	icon_state = "package_long"
+	item_serial = "NRPS COMPLIANT<hr>MODULAR FLOOR STRUT x60<br>MODULAR FLOOR TILE x60<hr>UACM OUTER VEIL PST"
+	item_serial_distance = SERIAL_STRUCTURE_SIZE_FAR
+	variant_id = "default"
+
+/obj/structure/crafting/packages/dormstruts/attack_hand(mob/user)
+	user.visible_message(SPAN_NOTICE("[user] starts to unwrap a package."), SPAN_INFO("You start to unwrap the pacckage."), SPAN_DANGER("You hear tearing sounds."))
+	if(do_after(user, (CRAFTING_DELAY_NORMAL * user.get_skill_duration_multiplier(SKILL_CONSTRUCTION)), INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD))
+		user.visible_message(SPAN_NOTICE("[user] tears through the package, revealing its contents. Once ripped, the packing material quickly turns to a fine dust."), SPAN_INFO("You tear through the package, revealing its contents. Once ripped, the packing material quickly turns to a fine dust."), SPAN_DANGER("The ripping stops."))
+		var/obj/item/stack/rods/floorstrut/strut1 = new(get_turf(src))
+		var/obj/item/stack/rods/floorstrut/strut2 = new(get_turf(src))
+		var/obj/item/stack/modulartiles/tile1 = new(get_turf(src))
+		var/obj/item/stack/modulartiles/tile2 = new(get_turf(src))
+		strut1.amount = 30
+		strut1.update_icon()
+		strut2.amount = 30
+		strut2.update_icon()
+		tile1.amount = 30
+		tile1.update_icon()
+		tile2.amount = 30
+		tile2.update_icon()
+		qdel(src)
+		return
 //frames
 
 /obj/structure/crafting/frame/
@@ -119,7 +164,7 @@
 
 /obj/structure/crafting/frame/bed/attackby(obj/item/C, mob/user)
 	if(istype(C, /obj/item/crafting/top/bed))
-		var/obj/item/crafting/top/bed/top
+		var/obj/item/crafting/top/bed/top = C
 		user.visible_message(SPAN_NOTICE("[user] places a bag in the middle of the frame and pushes a button on the side."), SPAN_INFO("You place a bag in the middle of the frame and push a button on the side."))
 		if(do_after(user, (CRAFTING_DELAY_NORMAL * user.get_skill_duration_multiplier(SKILL_CONSTRUCTION)), INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD))
 			var/obj/structure/bed/modular/bed = new(get_turf(src))
@@ -133,7 +178,7 @@
 		if(user.a_intent == INTENT_GRAB)
 			user.visible_message(SPAN_NOTICE("[user] starts to disassemble the frame."), SPAN_INFO("You start to disassemble the frame."))
 			if(do_after(user, (CRAFTING_DELAY_NORMAL * user.get_skill_duration_multiplier(SKILL_CONSTRUCTION)), INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD))
-				var/obj/item/crafting/frame_elements/bed/B
+				var/obj/item/crafting/frame_elements/bed/B = C
 				B.variant_id = variant_id
 				qdel(src)
 				return
@@ -149,7 +194,7 @@
 
 /obj/structure/crafting/frame/drawers/attackby(obj/item/C, mob/user)
 	if(istype(C, /obj/item/crafting/top/drawers))
-		var/obj/item/crafting/top/drawers/D
+		var/obj/item/crafting/top/drawers/D = C
 		user.visible_message(SPAN_NOTICE("[user] slides metal drawers into the cabinet frame."), SPAN_INFO("You slide metal drawers into the cabinet frame."), SPAN_WARNING("You hear metal sliding against metal."))
 		if(do_after(user, (CRAFTING_DELAY_NORMAL * user.get_skill_duration_multiplier(SKILL_CONSTRUCTION)), INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD))
 			var/obj/structure/closet/modular/drawers/O = new(get_turf(src))
@@ -198,7 +243,7 @@
 	return
 
 /obj/structure/crafting/frame/chair/attackby(obj/item/C, mob/user)
-	if(istype(C, /obj/item/crafting/top/table/))
+	if(istype(C, /obj/item/crafting/top/chair/seat/))
 		var/obj/structure/crafting/frame/chair/W = C
 		user.visible_message(SPAN_NOTICE("[user] pushes a chair seat and backrest onto a chair frame."), SPAN_INFO("You push a chair seat and backrest onto a chair frame."), SPAN_WARNING("You hear a metallic thud."))
 		if(do_after(user, (CRAFTING_DELAY_NORMAL * user.get_skill_duration_multiplier(SKILL_CONSTRUCTION)), INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD))