Вечная война...

baystation12.dme

@@ -3260,9 +3260,16 @@
 #include "proxima\code\game\items\weapons\storage\supply_boxes.dm"
 #include "proxima\code\game\machinery\disk_writer.dm"
 #include "proxima\code\game\machinery\jukebox.dm"
+#include "proxima\code\game\machinery\remote_weapon.dm"
+#include "proxima\code\game\machinery\factory\blueprint.dm"
+#include "proxima\code\game\machinery\factory\factory.dm"
+#include "proxima\code\game\machinery\factory\blueprints\generic.dm"
+#include "proxima\code\game\objects\items\circuits_remote.dm"
 #include "proxima\code\game\objects\items\containers.dm"
 #include "proxima\code\game\objects\items\posters.dm"
+#include "proxima\code\game\objects\items\remote_weapon_ammo.dm"
 #include "proxima\code\game\objects\items\toys.dm"
+#include "proxima\code\game\objects\items\device\remote_weapon_controller.dm"
 #include "proxima\code\game\objects\structures\barrier.dm"
 #include "proxima\code\game\objects\structures\holoplants.dm"
 #include "proxima\code\game\objects\effects\particles\snow.dm"

code/modules/overmap/exoplanets/turfs.dm

@@ -256,3 +256,7 @@
 			if(L.pulling)
 				var/atom/movable/AM = L.pulling
 				AM.forceMove(T)
+
+// Singulo won't delete literal planet edges
+/turf/simulated/planet_edge/singularity_act()
+	return

code/modules/reagents/Chemistry-Reagents.dm

@@ -62,6 +62,11 @@
 
 	var/should_admin_log = FALSE
 
+		/// Assoc list with key type of addiction this reagent feeds, and value amount of addiction points added per unit of reagent metabolzied (which means * REM every life())
+	var/list/addiction_types = null
+
+
+
 	//Fire, hellfire
 	var/accelerant_quality = 0
 	var/fire_colour = null //In case this reagent would burn a cool different colour

code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm

@@ -123,6 +123,7 @@
 	value = DISPENSER_REAGENT_VALUE
 	accelerant_quality = 5
 
+
 /datum/reagent/ethanol/touch_mob(var/mob/living/L, var/amount)
 	if(istype(L))
 		L.adjust_fire_stacks(amount / 15)

code/modules/research/designs/designs_circuits.dm

@@ -847,3 +847,24 @@
 	req_tech = list(TECH_ENGINEERING = 1)
 	build_path = /obj/item/stock_parts/circuitboard/shipmap
 	sort_string = "SAAAT"
+
+/datum/design/circuit/minirart
+	name = "stationary rocket launcher"
+	id = "minirwbs"
+	req_tech = list(TECH_ENGINEERING = 6, TECH_COMBAT = 7, TECH_POWER = 6)
+	build_path = /obj/item/stock_parts/circuitboard/remote_weapon/loadable
+	sort_string = "YAAAG"
+
+/datum/design/circuit/minirartbs
+	name = "stationary bluespace rocket launcher"
+	id = "minirwbs"
+	req_tech = list(TECH_ENGINEERING = 6, TECH_COMBAT = 7, TECH_POWER = 6, TECH_BLUESPACE = 6)
+	build_path = /obj/item/stock_parts/circuitboard/remote_weapon/loadable/bs
+	sort_string = "YAAAH"
+
+/datum/design/circuit/minirartbs
+	name = "automated production factory"
+	id = "factory"
+	req_tech = list(TECH_ENGINEERING = 3, TECH_POWER = 2, TECH_DATA = 2, TECH_MATERIAL = 5)
+	build_path = /obj/item/stock_parts/circuitboard/factory
+	sort_string = "YAAAJ"

code/modules/research/designs/designs_weapon.dm

@@ -205,3 +205,27 @@
 	req_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 3)
 	build_path = /obj/item/ammo_casing/shotgun/emp
 	sort_string = "TBAAG"
+
+/datum/design/item/weapon/ammunition/mortarhe
+	id = "mor_he"
+	desc = "A rocket used by remote bluespace rocket launchers. This one produces a potent explosion upon landing."
+	materials = list(MATERIAL_STEEL = 3000, MATERIAL_URANIUM = 500)
+	req_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 4)
+	build_path = /obj/item/remote_weapon_ammo/explosive
+	sort_string = "TBAAH"
+
+/datum/design/item/weapon/ammunition/mortarle
+	id = "mor_le"
+	desc = "A rocket used by remote bluespace rocket launchers. This one produces a relatively weak explosion upon landing.."
+	materials = list(MATERIAL_STEEL = 3000, MATERIAL_URANIUM = 200)
+	req_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 4)
+	build_path = /obj/item/remote_weapon_ammo/explosive/low
+	sort_string = "TBAAJ"
+
+/datum/design/item/weapon/ammunition/mortarill
+	id = "mor_ill"
+	desc = "A rocket used by remote bluespace rocket launchers. This thing produces a reaction with gorenje chemicals that illuminates a large area."
+	materials = list(MATERIAL_STEEL = 3000, MATERIAL_PHORON =200, MATERIAL_PLASTIC = 200)
+	req_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 4, TECH_POWER = 3)
+	build_path = /obj/item/remote_weapon_ammo/explosive/illumination
+	sort_string = "TBAAK"

code/modules/sprite_accessories/accessory_human.dm

@@ -1,5 +1,5 @@
 /datum/sprite_accessory/marking/human
-	species_allowed = list(SPECIES_HUMAN, SPECIES_SHELL)
+	species_allowed = list(SPECIES_HUMAN, SPECIES_SHELL, SPECIES_VATGROWN, SPECIES_GRAVWORLDER, SPECIES_TRITONIAN, SPECIES_SPACER)
 	icon = 'icons/mob/human_races/species/human/bodymods.dmi'
 
 

interface/skin.dmf

@@ -658,7 +658,7 @@ macro "hotkeymode"
 		name = "C"
 		command = "Face-Direction"
 	elem
-		name = "SPACE"
+		name = "V"
 		command = "Focus-View"
 
 macro "borgmacro"

proxima/code/game/machinery/factory/blueprint.dm

@@ -0,0 +1,24 @@
+/obj/item/factory_blueprint
+	name = "unknown blueprint"
+	desc = "This does nothing. Report to coders."
+	icon = 'proxima/icons/obj/factory/blueprints.dmi'
+	icon_state = "blueprint"
+	item_state = "blueprint"
+
+	/// Item that will be produced in factory with this blueprint
+	var/production_path = null
+	/// Amount of ticks it takes to produce an item
+	var/production_time = 10
+	/// List of items needed to start producing it on factory
+	var/list/required_materials = list()
+
+/obj/item/factory_blueprint/examine(mob/user)
+	. = ..()
+	if(ispath(production_path))
+		var/obj/item/PRP = production_path
+		to_chat(user, SPAN_NOTICE("It is a blueprint for [initial(PRP.name)]"))
+	if(LAZYLEN(required_materials))
+		to_chat(user, SPAN_NOTICE("It requires the following materials:"))
+		for(var/path_type in required_materials)
+			var/obj/item/PT = path_type
+			to_chat(user, SPAN_NOTICE("- [initial(PT.name)] x[required_materials[path_type]]."))

proxima/code/game/machinery/factory/blueprints/generic.dm

@@ -0,0 +1,33 @@
+/obj/item/factory_blueprint/cigarette
+	name = "cigarette refinery blueprint"
+	desc = "A blueprint that allows factory to re-create a cigarette butt back into usable shape."
+
+	production_path = /obj/item/clothing/mask/smokable/cigarette
+	production_time = 5
+	required_materials = list(
+		/obj/item/trash/cigbutt = 1,
+		/obj/item/paper = 1,
+		)
+
+/obj/item/factory_blueprint/flarebox
+	name = "flarebox blueprint"
+	desc = "A blueprint that allows factory to create flare box."
+
+	production_path = /obj/item/storage/fancy/supply_box/flare
+	production_time = 15
+	required_materials = list(
+		/obj/item/stack/material/steel = 5,
+		/obj/item/stack/material/phoron = 1,
+		)
+
+/obj/item/factory_blueprint/illiminationbox
+	name = "light grenade box blueprint"
+	desc = "A blueprint that allows factory to create light grenade box."
+
+	production_path = /obj/item/storage/fancy/supply_box/flare
+	production_time = 15
+	required_materials = list(
+		/obj/item/stack/material/steel = 10,
+		/obj/item/stack/material/aluminium = 5,
+		/obj/item/stack/material/phoron = 2,
+		)