Merge branch 'master' into king

modular_RUtgmc/_maps/shuttles/alamo.dmm → _maps/~RUTGMC/shuttles/alamo.dmm

@@ -220,9 +220,7 @@
 /turf/open/shuttle/dropship/floor/alt,
 /area/shuttle/dropship/alamo)
 "Hj" = (
-/obj/machinery/computer/shuttle/marine_dropship/one{
-	icon_state = "console2"
-	},
+/obj/machinery/computer/shuttle/marine_dropship/two,
 /turf/open/shuttle/dropship/floor,
 /area/shuttle/dropship/alamo)
 "HK" = (

modular_RUtgmc/_maps/shuttles/normandy.dmm → _maps/~RUTGMC/shuttles/normandy.dmm

@@ -172,9 +172,7 @@
 	},
 /area/shuttle/dropship/normandy)
 "pm" = (
-/obj/machinery/computer/shuttle/marine_dropship/two{
-	icon_state = "console"
-	},
+/obj/machinery/computer/shuttle/marine_dropship/one,
 /turf/closed/shuttle/dropship2/panel{
 	opacity = 0;
 	dir = 1

code/__DEFINES/mobs.dm

@@ -580,7 +580,7 @@ GLOBAL_LIST_INIT(xenoupgradetiers, list(XENO_UPGRADE_BASETYPE, XENO_UPGRADE_INVA
 
 #define RAVAGER_ENDURE_DURATION				10 SECONDS
 #define RAVAGER_ENDURE_DURATION_WARNING		0.7
-#define RAVAGER_ENDURE_HP_LIMIT				-100
+#define RAVAGER_ENDURE_HP_LIMIT				-125 //RUTGMC EDIT
 
 #define RAVAGER_RAGE_DURATION							10 SECONDS
 #define RAVAGER_RAGE_WARNING							0.7

code/modules/mob/living/carbon/xenomorph/castes/boiler/abilities_boiler.dm

@@ -291,15 +291,15 @@ GLOBAL_LIST_INIT(boiler_glob_image_list, list(
 /datum/action/xeno_action/activable/bombard/proc/root()
 	if(HAS_TRAIT_FROM(owner, TRAIT_IMMOBILE, BOILER_ROOTED_TRAIT))
 		owner.balloon_alert_to_viewers("Rooting out of place...")
-		if(!do_after(owner, 3 SECONDS, FALSE, null, BUSY_ICON_HOSTILE))
+		if(!do_after(owner, 1 SECONDS, FALSE, null, BUSY_ICON_HOSTILE)) //RUTGMC EDIT
 			owner.balloon_alert(owner, "Interrupted!")
 			return
 		owner.balloon_alert(owner, "Unrooted!")
 		set_rooted(FALSE)
 		return
 
 	owner.balloon_alert_to_viewers("Rooting into place...")
-	if(!do_after(owner, 3 SECONDS, FALSE, null, BUSY_ICON_HOSTILE))
+	if(!do_after(owner, 1 SECONDS, FALSE, null, BUSY_ICON_HOSTILE)) //RUTGMC EDIT
 		owner.balloon_alert(owner, "Interrupted!")
 		return
 

code/modules/mob/living/carbon/xenomorph/castes/crusher/castedatum_crusher.dm

@@ -49,6 +49,7 @@
 		/datum/action/xeno_action/activable/stomp,
 		/datum/action/xeno_action/ready_charge,
 		/datum/action/xeno_action/activable/cresttoss,
+		/datum/action/xeno_action/regenerate_skin,
 	)
 
 /datum/xeno_caste/crusher/on_caste_applied(mob/xenomorph)
@@ -77,5 +78,6 @@
 		/datum/action/xeno_action/activable/stomp,
 		/datum/action/xeno_action/ready_charge,
 		/datum/action/xeno_action/activable/cresttoss,
+		/datum/action/xeno_action/regenerate_skin,
 		/datum/action/xeno_action/activable/advance,
 	)

code/modules/mob/living/carbon/xenomorph/castes/defender/abilities_defender.dm

@@ -382,7 +382,7 @@
 
 	X.do_jitter_animation(1000)
 	X.set_sunder(0)
-	X.heal_overall_damage(25, 25, updating_health = TRUE)
+	X.heal_overall_damage(50, 50, updating_health = TRUE) //RUTGMC EDIT
 	add_cooldown()
 	return succeed_activate()
 

code/modules/mob/living/carbon/xenomorph/castes/ravager/abilities_ravager.dm

@@ -347,7 +347,7 @@
 		//rage_power = 0.5 //ORIGINAL
 		rage_power = 1 //RUTGMC EDIT CHANGE
 
-	var/rage_power_radius = CEILING(rage_power * 7, 1) //Define radius of the SFX
+	var/rage_power_radius = CEILING(rage_power * 3, 1) //Define radius of the SFX //RUTGMC EDIT
 
 	X.visible_message(span_danger("\The [X] becomes frenzied, bellowing with a shuddering roar!"), \
 	span_highdanger("We bellow as our fury overtakes us! RIP AND TEAR!"))

modular_RUtgmc/code/datums/shuttles.dm

@@ -1,9 +1,9 @@
 /datum/map_template/shuttle/dropship_one
-	prefix = "modular_RUtgmc/_maps/shuttles/"
+	prefix = "_maps/~RUTGMC/shuttles/"
 	shuttle_id = SHUTTLE_NORMANDY
 	name = "Normandy"
 
 /datum/map_template/shuttle/dropship_two
-	prefix = "modular_RUtgmc/_maps/shuttles/"
+	prefix = "_maps/~RUTGMC/shuttles/"
 	shuttle_id = SHUTTLE_ALAMO
 	name = "Alamo"

modular_RUtgmc/code/modules/mob/living/carbon/xenomorph/castes/carrier/abilities_carrier.dm

@@ -26,4 +26,7 @@
 /datum/action/xeno_action/place_trap
 	desc = "Place a hole on weeds that can be filled with a hugger, liquid acid, acid or neurotoxin gas. Activates when a marine steps on it."
 	action_icon_state = "small_trap"
+	plasma_cost = 200
 
+/datum/action/xeno_action/spawn_hugger
+	plasma_cost = 100

modular_RUtgmc/code/modules/mob/living/carbon/xenomorph/castes/crusher/abilities_crusher.dm

@@ -0,0 +1,40 @@
+// ***************************************
+// *********** Regenerate Skin
+// ***************************************
+/datum/action/xeno_action/regenerate_skin
+	name = "Regenerate Armor"
+	action_icon_state = "regenerate_skin"
+	desc = "Regenerate your hard exoskeleton armor, removing all sunder."
+	ability_name = "regenerate skin"
+	use_state_flags = XACT_TARGET_SELF|XACT_IGNORE_SELECTED_ABILITY|XACT_KEYBIND_USE_ABILITY
+	plasma_cost = 400
+	cooldown_timer = 3 MINUTES
+	keybind_flags = XACT_KEYBIND_USE_ABILITY
+	keybinding_signals = list(
+		KEYBINDING_NORMAL = COMSIG_XENOABILITY_REGENERATE_SKIN,
+	)
+
+/datum/action/xeno_action/regenerate_skin/on_cooldown_finish()
+	var/mob/living/carbon/xenomorph/X = owner
+	to_chat(X, span_notice("We feel we are ready to shred our armor and grow another."))
+	return ..()
+
+/datum/action/xeno_action/regenerate_skin/action_activate()
+	var/mob/living/carbon/xenomorph/crusher/X = owner
+
+	if(!can_use_action(TRUE))
+		return fail_activate()
+
+	if(X.on_fire)
+		to_chat(X, span_xenowarning("We can't use that while on fire."))
+		return fail_activate()
+
+	X.emote("roar")
+	X.visible_message(span_warning("The armor on \the [X] shreds and a new layer can be seen in it's place!"),
+		span_notice("We shed our armor, showing the fresh new layer underneath!"))
+
+	X.do_jitter_animation(1000)
+	X.set_sunder(0)
+	add_cooldown()
+	return succeed_activate()
+

modular_RUtgmc/code/modules/mob/living/carbon/xenomorph/castes/praetorian/praetorian.dm

@@ -1,2 +1,2 @@
 /mob/living/carbon/xenomorph/praetorian
-	'modular_RUtgmc/icons/Xeno/castes/praetorian.dmi'
+	icon = 'modular_RUtgmc/icons/Xeno/castes/praetorian.dmi'

modular_RUtgmc/code/modules/shuttle/marine_dropship.dm

@@ -1,47 +1,33 @@
 /obj/docking_port/stationary/marine_dropship/hangar/one
 	name = "Shipside 'Normandy' Hangar Pad"
 	id = SHUTTLE_NORMANDY
-	roundstart_template = /datum/map_template/shuttle/dropship_one
 
 /obj/docking_port/stationary/marine_dropship/hangar/two
 	name = "Shipside 'Alamo' Hangar Pad"
 	id = SHUTTLE_ALAMO
-	roundstart_template = /datum/map_template/shuttle/dropship_two
-	dheight = 6
-	dwidth = 4
-	height = 13
-	width = 9
 
 /obj/docking_port/mobile/marine_dropship/one
 	name = "Normandy"
 	id = SHUTTLE_NORMANDY
-	control_flags = SHUTTLE_MARINE_PRIMARY_DROPSHIP
 
 /obj/docking_port/mobile/marine_dropship/two
 	name = "Alamo"
 	id = SHUTTLE_ALAMO
-	control_flags = SHUTTLE_MARINE_PRIMARY_DROPSHIP
-	callTime = 28 SECONDS //smaller shuttle go whoosh
-	rechargeTime = 1.5 MINUTES
-	dheight = 6
-	dwidth = 4
-	height = 13
-	width = 9
 
 /obj/machinery/computer/shuttle/shuttle_control/dropship
 	name = "\improper 'Normandy' dropship console"
 	desc = "The remote controls for the 'Normandy' Dropship. Named after a department in France, noteworthy for the famous naval invasion of Normandy on the 6th of June 1944, a bloody but decisive victory in World War II and the campaign for the Liberation of France."
 	shuttleId = SHUTTLE_NORMANDY
-	icon = 'icons/obj/machines/computer.dmi'
-	icon_state = "shuttle"
-	resistance_flags = RESIST_ALL
-	req_one_access = list(ACCESS_MARINE_DROPSHIP, ACCESS_MARINE_LEADER) // TLs can only operate the remote console
-	possible_destinations = "lz1;lz2;alamo"
-	compatible_control_flags = SHUTTLE_MARINE_PRIMARY_DROPSHIP
-
 
 /obj/machinery/computer/shuttle/shuttle_control/dropship/two
 	name = "\improper 'Alamo' dropship console"
 	desc = "The remote controls for the 'Alamo' Dropship. Named after the Alamo Mission, stage of the Battle of the Alamo in the United States' state of Texas in the Spring of 1836. The defenders held to the last, encouraging other Texans to rally to the flag."
 	shuttleId = SHUTTLE_ALAMO
-	possible_destinations = "lz1;lz2;normandy;alamo"
+
+/obj/machinery/computer/shuttle/marine_dropship/one
+	name = "\improper 'Normandy' flight controls"
+	desc = "The flight controls for the 'Normandy' Dropship. Named after a department in France, noteworthy for the famous naval invasion of Normandy on the 6th of June 1944, a bloody but decisive victory in World War II and the campaign for the Liberation of France."
+
+/obj/machinery/computer/shuttle/marine_dropship/two
+	name = "\improper 'Alamo' flight controls"
+	desc = "The flight controls for the 'Alamo' Dropship. Named after the Alamo Mission, stage of the Battle of the Alamo in the United States' state of Texas in the Spring of 1836. The defenders held to the last, encouraging other Texians to rally to the flag."

modular_RUtgmc/includes.dm

@@ -109,6 +109,7 @@
 #include "code\modules\mob\living\carbon\xenomorph\castes\panther\abilities_panther.dm"
 #include "code\modules\mob\living\carbon\xenomorph\castes\praetorian\abilities_praetorian.dm"
 #include "code\modules\mob\living\carbon\xenomorph\castes\praetorian\castedatum_praetorian.dm"
+#include "code\modules\mob\living\carbon\xenomorph\castes\praetorian\praetorian.dm"
 // #include "code\modules\mob\living\carbon\xenomorph\castes\predalien\castedatum_predalien.dm"
 // #include "code\modules\mob\living\carbon\xenomorph\castes\predalien\predalien.dm"
 // #include "code\modules\mob\living\carbon\xenomorph\castes\predalien\abilities_predalien.dm"
@@ -136,7 +137,6 @@
 #include "code\modules\xenomorph\xeno_structures.dm"
 #include "code\modules\mob\living\carbon\xenomorph\life.dm"
 #include "code\modules\mob\living\carbon\xenomorph\death.dm"
-#include "code\modules\mob\living\carbon\human\life\death.dm"
 #include "code\_onclick\hud\screen_objects\screen_objects.dm"
 #include "code\controllers\subsystem\points.dm"
 #include "code\modules\reqs\supply.dm"
@@ -183,6 +183,7 @@
 #include "code\datums\keybinding\communication.dm"
 #include "code\__HELPERS\text.dm"
 #include "code\modules\projectiles\guns\specialist.dm"
+#include "code\modules\mob\living\carbon\xenomorph\castes\crusher\abilities_crusher.dm"
 #include "code\modules\clothing\modular_armor\jaeger.dm"
 #include "code\modules\clothing\modular_armor\attachments\chest_plates.dm"
 #include "code\modules\reagents\reactions\medical.dm"

tgui/packages/tgui/styles/main.scss

@@ -73,4 +73,3 @@
   background-position: center;
   background-repeat: no-repeat;
 }
-