Kahraman, after collecting dust for 100 years, finally has its own co…

…ntent, hear ye guncargo naysayers and weep (#98) * this is just like thumper from half life 2 * clothing stuff * and then she tested code all over the place * fixes everything * makes the thumper take longer * but not too much longer * right i didnt actually do that part * some desc stuff * makes the gps beacon small * Update modular_nova/modules/company_imports/code/armament_datums/kahraman_industries.dm Co-authored-by: Bloop <[email protected]> * Update modular_nova/modules/company_imports/code/armament_datums/kahraman_industries.dm Co-authored-by: Bloop <[email protected]> * Update modular_nova/modules/kahraman_equipment/code/clothing/clothing.dm Co-authored-by: Bloop <[email protected]> * Update modular_nova/modules/kahraman_equipment/code/clothing/clothing.dm Co-authored-by: Bloop <[email protected]> * fixes bolding * fixes the ore thumper proximity check * fixes the desc to better reflect how the thumper works * fixes it on recent master * Update modular_nova/modules/kahraman_equipment/code/ore_thumper.dm Co-authored-by: Bloop <[email protected]> * Update modular_nova/modules/kahraman_equipment/code/ore_thumper.dm Co-authored-by: Bloop <[email protected]> * Update modular_nova/modules/kahraman_equipment/code/ore_thumper.dm Co-authored-by: Bloop <[email protected]> * gives the protective mod digisprites * slightly increases the amount of plants that the mat printer can hold * makes the thumper's power needs more apparent --------- Co-authored-by: Bloop <[email protected]>
Fluffy-Frontier · Jan 10, 2024 · f207080 · f207080
1 parent f5f900c
commit f207080
Show file tree

Hide file tree

Showing 36 changed files with 1,103 additions and 78 deletions.
diff --git a/code/__DEFINES/~nova_defines/colony_fabricator_misc.dm b/code/__DEFINES/~nova_defines/colony_fabricator_misc.dm
@@ -35,4 +35,6 @@ GLOBAL_LIST_INIT(colonist_suit_allowed, list(
 	/obj/item/resonator,
 	/obj/item/t_scanner,
 	/obj/item/analyzer,
+	/obj/item/storage/medkit,
+	/obj/item/fireaxe/metal_h2_axe,
 ))
diff --git a/code/__DEFINES/~nova_defines/manufacturer_strings.dm b/code/__DEFINES/~nova_defines/manufacturer_strings.dm
@@ -22,5 +22,6 @@
 #define COMPANY_ABDUCTOR "It has <b>[span_abductor("✌︎︎♌︎︎♎︎︎◆︎︎♍︎︎⧫︎︎❄︎♏︎♍︎♒︎")]</b> engraved into it."
 
 #define COMPANY_FRONTIER "It has a small label with <b>[span_engradio("Akhter Company Frontier Equipment")]</b> printed on it, alongside various xerxian proof-marks."
+#define COMPANY_KAHRAMAN "It has a <b>[span_red("red label")] with <b>[span_red("K - A - S")]</b> printed on it, alongside various xerxian proof-marks.</b>"
 
 #define COMPANY_REMOVED "It has had <b>[span_grey("all identifying marks scrubbed off")].</b>"
diff --git a/modular_nova/master_files/icons/mob/clothing/modsuit/mod_clothing_mutant.dmi b/modular_nova/master_files/icons/mob/clothing/modsuit/mod_clothing_mutant.dmi
diff --git a/modular_nova/modules/company_imports/code/armament_datums/kahraman_industries.dm b/modular_nova/modules/company_imports/code/armament_datums/kahraman_industries.dm
@@ -2,110 +2,108 @@
 	category = KAHRAMAN_INDUSTRIES_NAME
 	company_bitflag = CARGO_COMPANY_KAHRAMAN
 
-// Mining PPE, SEVAs and hardhats, have you passed your OSHA inspection today?
-
-/datum/armament_entry/company_import/kahraman/ppe
-	subcategory = "FOHSA Certified Protective Equipment"
-
-/datum/armament_entry/company_import/kahraman/ppe/weldhat
-	item_type = /obj/item/clothing/head/utility/hardhat/welding/orange
-	cost = PAYCHECK_CREW * 1.5
-
-/datum/armament_entry/company_import/kahraman/ppe/gasmask
-	item_type = /obj/item/clothing/mask/gas/alt
+/// Kahraman-made machines
+/datum/armament_entry/company_import/kahraman/machinery
+	subcategory = "Machinery"
+
+/datum/armament_entry/company_import/kahraman/machinery/biogenerator
+	item_type = /obj/item/flatpacked_machine/organics_printer
+	description = "An advanced machine seen in frontier outposts and colonies capable of turning organic plant matter into \
+		reagents and items of use that a fabricator can't typically make."
+	cost = CARGO_CRATE_VALUE * 3
+
+/datum/armament_entry/company_import/kahraman/machinery/ore_thumper
+	item_type = /obj/item/flatpacked_machine/ore_thumper
+	description = "A frame with a heavy block of metal suspended atop a pipe. \
+		Must be deployed outdoors and given a wired power connection. \
+		Forces pressurized gas into the ground which brings up buried resources."
+	cost = CARGO_CRATE_VALUE * 5
+
+/datum/armament_entry/company_import/kahraman/machinery/gps_beacon
+	item_type = /obj/item/flatpacked_machine/gps_beacon
+	description = "A packed GPS beacon, can be deployed and anchored into the ground to \
+		provide and unobstructed homing beacon for wayward travelers across the galaxy."
 	cost = PAYCHECK_LOWER
 
-/datum/armament_entry/company_import/kahraman/ppe/hazard_vest
-	item_type = /obj/item/clothing/suit/hazardvest
-	cost = PAYCHECK_CREW
-
-/datum/armament_entry/company_import/kahraman/ppe/seva_mask
-	item_type = /obj/item/clothing/mask/gas/seva
-	cost = PAYCHECK_CREW * 1.5
+// Occupational health and safety? Never heard of her.
 
-/datum/armament_entry/company_import/kahraman/ppe/seva_suit
-	item_type = /obj/item/clothing/suit/hooded/seva
-	cost = PAYCHECK_COMMAND * 2
+/datum/armament_entry/company_import/kahraman/ppe
+	subcategory = "Protective Equipment"
 
-/datum/armament_entry/company_import/kahraman/ppe/sensors_cuffs
-	item_type = /obj/item/kheiral_cuffs
-	cost = PAYCHECK_COMMAND * 5
+/datum/armament_entry/company_import/kahraman/ppe/hazard_mod
+	item_type = /obj/item/mod/control/pre_equipped/frontier_colonist
+	cost = PAYCHECK_COMMAND * 6.5
 
-// Hand held mining equipment
+/datum/armament_entry/company_import/kahraman/ppe/gas_mask
+	item_type = /obj/item/clothing/mask/gas/atmos/frontier_colonist
+	cost = PAYCHECK_COMMAND
 
-/datum/armament_entry/company_import/kahraman/mining_tool
-	subcategory = "Powered Mining Equipment"
+/datum/armament_entry/company_import/kahraman/ppe/headset
+	item_type = /obj/item/radio/headset/headset_frontier_colonist
+	cost = PAYCHECK_COMMAND * 1.5
 
-/datum/armament_entry/company_import/kahraman/mining_tool/drill
-	item_type = /obj/item/pickaxe/drill
+/datum/armament_entry/company_import/kahraman/ppe/flak_vest
+	item_type = /obj/item/clothing/suit/frontier_colonist_flak
 	cost = PAYCHECK_COMMAND
 
-/datum/armament_entry/company_import/kahraman/mining_tool/resonator
-	item_type = /obj/item/resonator
+/datum/armament_entry/company_import/kahraman/ppe/tanker_helmet
+	item_type = /obj/item/clothing/head/frontier_colonist_helmet
 	cost = PAYCHECK_COMMAND
 
-/datum/armament_entry/company_import/kahraman/mining_tool/pka
-	item_type = /obj/item/gun/energy/recharge/kinetic_accelerator
-	cost = PAYCHECK_COMMAND
+// Work clothing
 
-/datum/armament_entry/company_import/kahraman/mining_tool/cutter
-	item_type = /obj/item/gun/energy/plasmacutter
-	cost = PAYCHECK_COMMAND
+/datum/armament_entry/company_import/kahraman/work_clothing
+	subcategory = "Clothing"
 
-/datum/armament_entry/company_import/kahraman/mining_tool/diamond_drill
-	item_type = /obj/item/pickaxe/drill/diamonddrill
-	cost = PAYCHECK_COMMAND * 2
+/datum/armament_entry/company_import/kahraman/work_clothing/jumpsuit
+	item_type = /obj/item/clothing/under/frontier_colonist
+	cost = PAYCHECK_CREW
 
-/datum/armament_entry/company_import/kahraman/mining_tool/advanced_cutter
-	item_type = /obj/item/gun/energy/plasmacutter/adv
-	cost = PAYCHECK_COMMAND * 4
+/datum/armament_entry/company_import/kahraman/work_clothing/jacket
+	item_type = /obj/item/clothing/suit/jacket/frontier_colonist
+	cost = PAYCHECK_CREW
 
-/datum/armament_entry/company_import/kahraman/mining_tool/super_resonator
-	item_type = /obj/item/resonator/upgraded
-	cost = PAYCHECK_COMMAND * 4
+/datum/armament_entry/company_import/kahraman/work_clothing/jacket_short
+	item_type = /obj/item/clothing/suit/jacket/frontier_colonist/short
+	cost = PAYCHECK_CREW
 
-/datum/armament_entry/company_import/kahraman/mining_tool/jackhammer
-	item_type = /obj/item/pickaxe/drill/jackhammer
-	cost = PAYCHECK_COMMAND * 3
+/datum/armament_entry/company_import/kahraman/work_clothing/med_jacket
+	item_type = /obj/item/clothing/suit/jacket/frontier_colonist/medical
+	cost = PAYCHECK_CREW
 
-/datum/armament_entry/company_import/kahraman/sensing
-	subcategory = "Sensing Equipment"
+/datum/armament_entry/company_import/kahraman/work_clothing/ballcap
+	item_type = /obj/item/clothing/head/soft/frontier_colonist
+	cost = PAYCHECK_CREW
 
-/datum/armament_entry/company_import/kahraman/sensing/mesons
-	item_type = /obj/item/clothing/glasses/meson
+/datum/armament_entry/company_import/kahraman/work_clothing/med_ballcap
+	item_type = /obj/item/clothing/head/soft/frontier_colonist/medic
 	cost = PAYCHECK_CREW
 
-/datum/armament_entry/company_import/kahraman/sensing/autoscanner
-	item_type = /obj/item/t_scanner/adv_mining_scanner/lesser
-	cost = PAYCHECK_LOWER
+/datum/armament_entry/company_import/kahraman/work_clothing/booties
+	item_type = /obj/item/clothing/shoes/jackboots/frontier_colonist
+	cost = PAYCHECK_CREW
 
-/datum/armament_entry/company_import/kahraman/sensing/super_autoscanner
-	item_type = /obj/item/t_scanner/adv_mining_scanner
-	cost = PAYCHECK_COMMAND * 3
+/datum/armament_entry/company_import/kahraman/work_clothing/gloves
+	item_type = /obj/item/clothing/gloves/frontier_colonist
+	cost = PAYCHECK_CREW
 
-/datum/armament_entry/company_import/kahraman/sensing/nvg_mesons
-	item_type = /obj/item/clothing/glasses/meson/night
-	cost = PAYCHECK_COMMAND * 3
+// "Equipment", so storage items and whatnot
 
-/datum/armament_entry/company_import/kahraman/mecha_tools
-	subcategory = "Heavy Powered Mining Equipment"
+/datum/armament_entry/company_import/kahraman/storage_equipment
+	subcategory = "Personal Equipment"
 
-/datum/armament_entry/company_import/kahraman/mecha_tools/scanner
-	item_type = /obj/item/mecha_parts/mecha_equipment/mining_scanner
+/datum/armament_entry/company_import/kahraman/storage_equipment/backpack
+	item_type = /obj/item/storage/backpack/industrial/frontier_colonist
 	cost = PAYCHECK_CREW
 
-/datum/armament_entry/company_import/kahraman/mecha_tools/drill
-	item_type = /obj/item/mecha_parts/mecha_equipment/drill
+/datum/armament_entry/company_import/kahraman/storage_equipment/satchel
+	item_type = /obj/item/storage/backpack/industrial/frontier_colonist/satchel
 	cost = PAYCHECK_CREW
 
-/datum/armament_entry/company_import/kahraman/mecha_tools/pka
-	item_type = /obj/item/mecha_parts/mecha_equipment/weapon/energy/mecha_kineticgun
-	cost = PAYCHECK_CREW * 3
-
-/datum/armament_entry/company_import/kahraman/mecha_tools/diamond_drill
-	item_type = /obj/item/mecha_parts/mecha_equipment/drill/diamonddrill
-	cost = PAYCHECK_CREW * 3
+/datum/armament_entry/company_import/kahraman/storage_equipment/messenger
+	item_type = /obj/item/storage/backpack/industrial/frontier_colonist/messenger
+	cost = PAYCHECK_CREW
 
-/datum/armament_entry/company_import/kahraman/mecha_tools/cutter
-	item_type = /obj/item/mecha_parts/mecha_equipment/weapon/energy/plasma
-	cost = PAYCHECK_CREW * 3
+/datum/armament_entry/company_import/kahraman/storage_equipment/belt
+	item_type = /obj/item/storage/belt/utility/frontier_colonist
+	cost = PAYCHECK_CREW
diff --git a/modular_nova/modules/kahraman_equipment/code/clothing/armor_datums.dm b/modular_nova/modules/kahraman_equipment/code/clothing/armor_datums.dm
@@ -0,0 +1,30 @@
+/datum/armor/colonist_clothing
+	laser = ARMOR_LEVEL_TINY
+	energy = ARMOR_LEVEL_TINY
+	bomb = ARMOR_LEVEL_TINY
+	bio = ARMOR_LEVEL_TINY
+	fire = ARMOR_LEVEL_WEAK
+	acid = ARMOR_LEVEL_TINY
+	wound = WOUND_ARMOR_WEAK
+
+/datum/armor/colonist_armor
+	melee = ARMOR_LEVEL_WEAK
+	bullet = ARMOR_LEVEL_WEAK
+	laser = ARMOR_LEVEL_TINY
+	energy = ARMOR_LEVEL_TINY
+	bomb = ARMOR_LEVEL_TINY
+	bio = ARMOR_LEVEL_TINY
+	fire = ARMOR_LEVEL_WEAK
+	acid = ARMOR_LEVEL_TINY
+	wound = WOUND_ARMOR_STANDARD
+
+/datum/armor/colonist_hazard
+	melee = ARMOR_LEVEL_TINY
+	bullet = ARMOR_LEVEL_TINY
+	laser = ARMOR_LEVEL_WEAK
+	energy = ARMOR_LEVEL_WEAK
+	bomb = ARMOR_LEVEL_MID
+	bio = 100
+	fire = 100
+	acid = ARMOR_LEVEL_MID
+	wound = WOUND_ARMOR_WEAK