Merge pull request #47 from Bubberstation/ERT-branch

Asset Protection Tweaks

modular_skyrat/master_files/code/modules/clothing/outfits/ert.dm

@@ -6,16 +6,17 @@
 /datum/outfit/centcom/asset_protection
 	name = "Asset Protection"
 
-	uniform = /obj/item/clothing/under/rank/centcom/commander
-	back = /obj/item/mod/control/pre_equipped/apocryphal
+	uniform = /obj/item/clothing/under/syndicate/sniper //BUBBER EDIT: Original: /obj/item/clothing/under/rank/centcom/commander
+	back = /obj/item/mod/control/pre_equipped/asset_protection //BUBBER EDIT Original: /obj/item/mod/control/pre_equipped/apocryphal
 	shoes = /obj/item/clothing/shoes/combat/swat
 	gloves = /obj/item/clothing/gloves/tackler/combat/insulated
 	mask = /obj/item/clothing/mask/gas/sechailer/swat
 	glasses = /obj/item/clothing/glasses/hud/toggle/thermal
-	l_pocket = /obj/item/flashlight
+	l_pocket = /obj/item/flashlight/seclite //BUBBER EDIT Original: /obj/item/flashlight/
 	r_pocket = /obj/item/tank/internals/emergency_oxygen/double
 	belt = /obj/item/storage/belt/security/full
-	l_hand = /obj/item/gun/energy/pulse/carbine/loyalpin // if this is still bulky make it not bulky and storable on belt/back/bag/exosuit
+	l_hand = /obj/item/gun/energy/pulse/pistol/m1911/loyalpin // if this is still bulky make it not bulky and storable on belt/back/bag/exosuit
+	//BUBBER EDIT: Original /obj/item/gun/energy/pulse/carbine/loyalpin
 	id = /obj/item/card/id/advanced/centcom/ert
 	ears = /obj/item/radio/headset/headset_cent/alt
 

modular_zubbers/code/modules/Dynamic/MidroundRulesets.dm

@@ -0,0 +1,38 @@
+// It should go without saying that these are all Bubberstation edits
+/datum/dynamic_ruleset/midround/from_living/autotraitor
+	repeatable = TRUE
+
+/datum/dynamic_ruleset/midround/from_ghosts/blob
+	repeatable = TRUE
+
+/datum/dynamic_ruleset/midround/from_living/blob_infection
+	repeatable = TRUE
+
+/datum/dynamic_ruleset/midround/from_ghosts/xenomorph
+	repeatable = FALSE
+
+/datum/dynamic_ruleset/midround/from_ghosts/nightmare
+	repeatable = FALSE
+
+/datum/dynamic_ruleset/midround/from_ghosts/abductors
+	repeatable = FALSE
+
+/datum/dynamic_ruleset/midround/from_ghosts/space_ninja
+	minimum_players = 20
+	repeatable = FALSE
+
+/datum/dynamic_ruleset/midround/spiders
+	repeatable = FALSE
+
+/datum/dynamic_ruleset/midround/from_ghosts/revenant
+	repeatable = FALSE
+
+/datum/dynamic_ruleset/midround/from_ghosts/sentient_disease
+	repeatable = FALSE
+
+/datum/dynamic_ruleset/midround/pirates
+	repeatable = FALSE
+
+/datum/dynamic_ruleset/midround/from_living/obsessed
+	cost = 4
+	repeatable = FALSE

modular_zubbers/code/modules/mod/mod_theme.dm

@@ -0,0 +1,59 @@
+/datum/mod_theme/asset_protection
+	name = "Asset Protection"
+	desc = "A weaker version of the Apocryphal Modsuit, chiefly worn by Nanotrasen Asset Protection."
+	extended_desc = "A weaker version of the Apocryphal Modsuit meant for the Nanotrasen Asset Protection Division. This suit boasts higher speed and advanced actuators that make moving feel almost weightless, with advanced features for the savvy bodyguard."
+	default_skin = "asset_protection"
+	armor_type = /datum/armor/mod_theme_ap
+	resistance_flags = FIRE_PROOF|ACID_PROOF
+	atom_flags = PREVENT_CONTENTS_EXPLOSION_1
+	max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
+	siemens_coefficient = 0
+	slowdown_inactive = 0.5
+	slowdown_active = 0
+	allowed_suit_storage = list(
+		/obj/item/ammo_box,
+		/obj/item/ammo_casing,
+		/obj/item/restraints/handcuffs,
+		/obj/item/assembly/flash,
+		/obj/item/melee/baton,
+	)
+	skins = list(
+		"asset_protection" = list(
+			MOD_ICON_OVERRIDE = 'modular_zubbers/icons/obj/clothing/modsuit/mod_clothing.dmi',
+			MOD_WORN_ICON_OVERRIDE = 'modular_zubbers/icons/mob/clothing/modsuit/mod_clothing.dmi',
+			HELMET_FLAGS = list(
+				UNSEALED_LAYER = null,
+				UNSEALED_CLOTHING = SNUG_FIT|THICKMATERIAL,
+				SEALED_CLOTHING = STOPSPRESSUREDAMAGE|HEADINTERNALS,
+				UNSEALED_INVISIBILITY = HIDEEARS|HIDEHAIR,
+				SEALED_INVISIBILITY = HIDEFACIALHAIR|HIDEMASK|HIDEEYES|HIDEFACE|HIDESNOUT,
+				SEALED_COVER = HEADCOVERSMOUTH|HEADCOVERSEYES|PEPPERPROOF,
+			),
+			CHESTPLATE_FLAGS = list(
+				UNSEALED_CLOTHING = THICKMATERIAL,
+				SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+				SEALED_INVISIBILITY = HIDEJUMPSUIT,
+			),
+			GAUNTLETS_FLAGS = list(
+				UNSEALED_CLOTHING = THICKMATERIAL,
+				SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+				CAN_OVERSLOT = TRUE,
+			),
+			BOOTS_FLAGS = list(
+				UNSEALED_CLOTHING = THICKMATERIAL,
+				SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+				CAN_OVERSLOT = TRUE,
+			),
+		),
+	)
+
+/datum/armor/mod_theme_ap
+	melee = 50
+	bullet = 40
+	laser = 50
+	energy = 50
+	bomb = 50
+	bio = 100
+	fire = 100
+	acid = 100
+	wound = 15

modular_zubbers/code/modules/mod/mod_types.dm

@@ -0,0 +1,18 @@
+/obj/item/mod/control/pre_equipped/asset_protection
+	worn_icon = 'modular_zubbers/icons/mob/clothing/modsuit/mod_clothing.dmi'
+	icon = 'modular_zubbers/icons/obj/clothing/modsuit/mod_clothing.dmi'
+	icon_state = "asset_protection-control"
+	theme = /datum/mod_theme/asset_protection
+	applied_cell = /obj/item/stock_parts/cell/bluespace
+	applied_modules = list(
+		/obj/item/mod/module/storage/bluespace,
+		/obj/item/mod/module/welding,
+		/obj/item/mod/module/emp_shield/advanced,
+		/obj/item/mod/module/magnetic_harness,
+		/obj/item/mod/module/jetpack,
+		/obj/item/mod/module/projectile_dampener,
+		/obj/item/mod/module/status_readout/generic,
+	)
+	default_pins = list(
+		/obj/item/mod/module/jetpack,
+	)

modular_zubbers/code/modules/projectiles/guns/energy/pulse.dm

@@ -0,0 +1,2 @@
+/obj/item/gun/energy/pulse/pistol/m1911/loyalpin
+	pin = /obj/item/firing_pin/implant/mindshield

tgstation.dme

@@ -6537,5 +6537,8 @@
 #include "modular_skyrat\modules\xenos_skyrat_redo\code\xeno_types\sentinel.dm"
 #include "modular_skyrat\modules\xenos_skyrat_redo\code\xeno_types\spitter.dm"
 #include "modular_skyrat\modules\xenos_skyrat_redo\code\xeno_types\warrior.dm"
-#include "modular_zubbers\modules\Dynamic\MidroundRulesets.dm"
+#include "modular_zubbers\code\modules\Dynamic\MidroundRulesets.dm"
+#include "modular_zubbers\code\modules\mod\mod_theme.dm"
+#include "modular_zubbers\code\modules\mod\mod_types.dm"
+#include "modular_zubbers\code\modules\projectiles\guns\energy\pulse.dm"
 // END_INCLUDE