Tau Ceti Celebration Event PR (#18981)

This fixes the HAPT shuttle/replaces it and adds the VIP ghost role to
the CCIA spawner for this weekends coming event, and for future use.

code/datums/outfits/ert/deathsquad.dm

@@ -68,3 +68,46 @@
 		H.put_in_hands(mercrig)
 		H.equip_to_slot_or_del(mercrig, slot_back)
 		addtimer(CALLBACK(mercrig, TYPE_PROC_REF(/obj/item/rig, toggle_seals), H, TRUE), 2 SECONDS)
+	belt_contents = list(
+		/obj/item/ammo_magazine/a454 = 2,
+		/obj/item/melee/baton/loaded = 1,
+		/obj/item/shield/energy = 1,
+		/obj/item/grenade/flashbang = 2,
+		/obj/item/handcuffs = 2,
+		/obj/item/grenade/frag = 1
+	)
+
+	id_iff = IFF_DEATHSQUAD
+
+/obj/outfit/admin/deathsquad/nt
+	name = "NanoTrasen Asset Protection Trooper"
+
+	back = /obj/item/rig/ert/ntassetprotection
+/obj/outfit/admin/deathsquad/nt/leader
+	name = "NanoTrasen Asset Protection Lead"
+
+	back = /obj/item/rig/ert/ntassetprotection/lead
+
+/obj/outfit/admin/deathsquad/nt/get_id_access()
+	return get_all_accesses()
+
+/obj/outfit/admin/deathsquad/nt/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+	. = ..()
+	if(visualsOnly)
+		return
+
+	var/obj/item/clothing/accessory/holster/armpit/hold = new(H)
+	var/obj/item/gun/projectile/weapon
+
+
+	if(syndie)
+		weapon = new /obj/item/gun/projectile/silenced(H)
+	else
+		weapon = new /obj/item/gun/projectile/revolver/mateba(H)
+
+	if(weapon)
+		hold.contents += weapon
+		hold.holstered = weapon
+
+	var/obj/item/clothing/under/U = H.get_equipped_item(slot_w_uniform)
+	U.attackby(hold, H)

code/datums/outfits/event/outfit_nanotrasen.dm

@@ -128,6 +128,16 @@
 	id_icon = "ccia"
 	id_access = "CCIA Agent"
 
+/obj/outfit/admin/nt/vip
+	name = "Very Important Person"
+
+	uniform = /obj/item/clothing/under/suit_jacket/nt_skirtsuit
+	shoes = /obj/item/clothing/shoes/flats
+	wrist = /obj/item/clothing/wrists/watch/gold
+	l_ear = /obj/item/device/radio/headset/ert/ccia
+	id = /obj/item/card/id/ccia
+	l_pocket = /obj/item/reagent_containers/spray/pepper
+
 /obj/outfit/admin/nt/odinsec
 	name = "NTCC Odin Security Specialist"
 

code/game/turfs/simulated/shuttle_turfs.dm

@@ -120,6 +120,12 @@
 /turf/simulated/wall/shuttle/raider
 	color = "#6C7364"
 
+/turf/simulated/wall/shuttle/hapt
+	color = "#2E2B2B"
+
+/turf/simulated/wall/shuttle/hapt/blue
+	color = "#3c526f"
+
 /turf/simulated/wall/shuttle/legion
 	color = "#5F78A0"
 

code/modules/clothing/spacesuits/rig/suits/ert.dm

@@ -245,3 +245,44 @@
 /obj/item/rig/ert/assetprotection/empty
 	initial_modules = list()
 
+/obj/item/rig/ert/ntassetprotection
+	name = "\improper heavy asset protection suit control module"
+	desc = "A heavy suit worn by the highest level of Asset Protection, don't mess with the person wearing this. Armored and space ready."
+	suit_type = "heavy asset protection"
+	icon = 'icons/clothing/rig/nt_asset_protection.dmi'
+	icon_state = "asset_protection_rig"
+	icon_supported_species_tags = null
+	armor = list(
+		melee = ARMOR_MELEE_SHIELDED,
+		bullet = ARMOR_BALLISTIC_RIFLE,
+		laser = ARMOR_LASER_HEAVY,
+		energy = ARMOR_ENERGY_SHIELDED,
+		bomb = ARMOR_BOMB_RESISTANT,
+		bio = ARMOR_BIO_SHIELDED,
+		rad = ARMOR_RAD_SHIELDED
+	)
+	slowdown = 0
+	emp_protection = 50
+
+	species_restricted = list(BODYTYPE_HUMAN)
+
+	initial_modules = list(
+		/obj/item/rig_module/ai_container,
+		/obj/item/rig_module/maneuvering_jets,
+		/obj/item/rig_module/grenade_launcher,
+		/obj/item/rig_module/vision/multi,
+		/obj/item/rig_module/mounted/pulse,
+		/obj/item/rig_module/chem_dispenser/combat,
+		/obj/item/rig_module/chem_dispenser/injector,
+		/obj/item/rig_module/device/drill,
+		/obj/item/rig_module/device/rfd_c,
+		/obj/item/rig_module/datajack,
+		/obj/item/rig_module/actuators/combat,
+		/obj/item/rig_module/recharger
+		)
+
+	allowed_module_types = MODULE_GENERAL | MODULE_LIGHT_COMBAT | MODULE_HEAVY_COMBAT | MODULE_SPECIAL | MODULE_MEDICAL | MODULE_UTILITY | MODULE_VAURCA // all modules
+
+/obj/item/rig/ert/ntassetprotection/lead
+	icon = 'icons/clothing/rig/nt_asset_protection_commander.dmi'
+	icon_state = "c_asset_protection_rig"

code/modules/ghostroles/spawner/human/admin/ccia.dm

@@ -28,6 +28,17 @@
 
 	mob_name_pick_message = "Pick a name."
 
+/datum/ghostspawner/human/admin/corporate/vip
+	short_name = "vip"
+	name = "Very Important Person"
+
+	outfit = /obj/outfit/admin/nt/vip
+
+	assigned_role = "VIP"
+	special_role = "VIP"
+
+	mob_name_pick_message = "Pick a name."
+
 /datum/ghostspawner/human/admin/corporate/ccia_agent/New()
 	desc = "Board the [SSatlas.current_map.station_name], annoy crew with your interviews and get squashed by your own shuttle."
 	..()

code/modules/shuttles/antagonist.dm

@@ -30,3 +30,10 @@
 	req_access = list(ACCESS_SYNDICATE)
 	shuttle_tag = "Merc Elite"
 	light_color = LIGHT_COLOR_RED
+
+/obj/machinery/computer/shuttle_control/multi/crescent
+	name = "shuttle control console"
+	req_access = list(ACCESS_CENT_SPECOPS)
+	shuttle_tag = "ICV Crescent"
+	light_color = LIGHT_COLOR_RED
+	can_rename_ship = TRUE

html/changelogs/changelog.yml

@@ -0,0 +1,61 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+#   bugfix
+#     - (fixes bugs)
+#   wip
+#     - (work in progress)
+#   qol
+#     - (quality of life)
+#   soundadd
+#     - (adds a sound)
+#   sounddel
+#     - (removes a sound)
+#   rscadd
+#     - (adds a feature)
+#   rscdel
+#     - (removes a feature)
+#   imageadd
+#     - (adds an image or sprite)
+#   imagedel
+#     - (removes an image or sprite)
+#   spellcheck
+#     - (fixes spelling or grammar)
+#   experiment
+#     - (experimental change)
+#   balance
+#     - (balance changes)
+#   code_imp
+#     - (misc internal code change)
+#   refactor
+#     - (refactors code)
+#   config
+#     - (makes a change to the config files)
+#   admin
+#     - (makes changes to administrator tools)
+#   server
+#     - (miscellaneous changes to server)
+#################################
+
+# Your name.
+author: ReadThisNamePlz, Noblerow
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, this gets changed to [] after reading.  Just remove the brackets when you add new shit.
+# Please surround your changes in  double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - rscadd: "Added a working HAPT shuttle."
+  - rscadd: "Added the VIP ghostrole to the CCIA Ghostspawner."
+  - rscadd: "Added a modified HAPT suit for NT HAPT use only."
+  - imageadd: "Added new sprites for the tweaked HAPT suit"

maps/_common/areas/shuttles.dm

@@ -78,7 +78,7 @@
 	name = "Naval Transport Shuttle"
 	area_flags = AREA_FLAG_RAD_SHIELDED | AREA_FLAG_SPAWN_ROOF | AREA_FLAG_NO_CREW_EXPECTED
 
-/area/shuttle/administration
+/area/shuttle/hapt
 	name = "Unidentified Corvette"
 	base_turf = /turf/unsimulated/floor/plating
 	sound_environment = SOUND_AREA_LARGE_ENCLOSED

maps/aurora/aurora-6_surface.dmm

@@ -3119,7 +3119,7 @@
 /area/tcommsat/chamber)
 "cwm" = (
 /obj/machinery/atmospherics/pipe/tank/air{
-	dir = 8;
+	dir = 8
 	},
 /obj/effect/floor_decal/industrial/hatch/yellow,
 /turf/simulated/floor/tiled/dark,
@@ -3353,8 +3353,7 @@
 	req_access = null;
 	dir = 1
 	},
-/obj/effect/spider/stickyweb{
-	},
+/obj/effect/spider/stickyweb,
 /obj/machinery/door/blast/shutters{
 	id = "commissary_counter";
 	name = "Shutter"
@@ -4824,10 +4823,6 @@
 /obj/item/stock_parts/subspace/crystal,
 /turf/simulated/floor/tiled,
 /area/turret_protected/tcomsat)
-"elM" = (
-/obj/effect/shuttle_landmark/admin/green,
-/turf/unsimulated/floor/asteroid/ash,
-/area/mine/explored)
 "elP" = (
 /obj/machinery/door/airlock/glass{
 	name = "Kitchen";
@@ -11885,8 +11880,7 @@
 	pixel_x = -4;
 	pixel_y = 3
 	},
-/obj/item/storage/firstaid/fire{
-	},
+/obj/item/storage/firstaid/fire,
 /turf/simulated/floor/tiled/dark,
 /area/shuttle/research)
 "kAm" = (
@@ -12931,8 +12925,7 @@
 /turf/simulated/floor/tiled,
 /area/quartermaster/loading)
 "lvK" = (
-/obj/structure/closet/cabinet{
-	},
+/obj/structure/closet/cabinet,
 /obj/effect/decal/cleanable/dirt,
 /obj/random/booze,
 /obj/effect/decal/cleanable/cobweb2,
@@ -16844,8 +16837,7 @@
 	dir = 1
 	},
 /obj/machinery/door/firedoor,
-/obj/machinery/status_display{
-	},
+/obj/machinery/status_display,
 /turf/simulated/floor/plating,
 /area/hallway/secondary/exit)
 "oQX" = (
@@ -17397,8 +17389,7 @@
 /turf/simulated/floor/tiled,
 /area/hallway/secondary/exit)
 "pqk" = (
-/obj/structure/closet/cabinet{
-	},
+/obj/structure/closet/cabinet,
 /obj/effect/decal/cleanable/dirt,
 /obj/random/random_flag,
 /obj/random/random_flag,
@@ -24315,10 +24306,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/turret_protected/tcomsat)
-"vgQ" = (
-/obj/effect/shuttle_landmark/admin/command,
-/turf/unsimulated/floor/asteroid/ash,
-/area/mine/explored)
 "vhb" = (
 /obj/structure/grille,
 /obj/structure/window/reinforced,
@@ -25570,8 +25557,7 @@
 /obj/structure/window/reinforced{
 	dir = 8
 	},
-/obj/machinery/status_display{
-	},
+/obj/machinery/status_display,
 /turf/simulated/floor/plating,
 /area/hallway/secondary/exit)
 "wlt" = (
@@ -27620,8 +27606,7 @@
 /turf/simulated/floor/carpet,
 /area/security/vacantoffice)
 "yav" = (
-/obj/structure/closet/cabinet{
-	},
+/obj/structure/closet/cabinet,
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/bed/stool/padded/red,
 /obj/structure/bed/stool/padded/red,
@@ -48326,7 +48311,7 @@ fdu
 fdu
 fdu
 fdu
-elM
+kKF
 fdu
 fdu
 fdu
@@ -77871,7 +77856,7 @@ fdu
 fdu
 fdu
 fdu
-vgQ
+kKF
 fdu
 fdu
 fdu

maps/aurora/code/aurora.dm

@@ -77,7 +77,6 @@
 		/datum/shuttle/autodock/ferry/arrival/aurora,
 		/datum/shuttle/autodock/ferry/supply/aurora,
 		/datum/shuttle/autodock/ferry/merchant_aurora,
-		/datum/shuttle/autodock/multi/admin,
 		/datum/shuttle/autodock/ferry/autoreturn/ccia,
 		/datum/shuttle/autodock/ferry/specops/ert_aurora,
 		/datum/shuttle/autodock/multi/antag/skipjack_aurora,

maps/aurora/code/aurora_shuttles.dm

@@ -161,39 +161,6 @@ AURORA_ESCAPE_POD(4)
 	base_turf = /turf/space
 	base_area = /area/space
 
-//-// Admin Corvette //-//
-
-/datum/shuttle/autodock/multi/admin
-	name = "Crescent Shuttle"
-	current_location = "nav_admin_start"
-	warmup_time = 10
-	shuttle_area = /area/shuttle/administration
-	dock_target = "admin_shuttle"
-	destination_tags = list(
-		"nav_admin_start",
-		"nav_admin_green",
-		"nav_admin_command"
-		)
-
-/obj/effect/shuttle_landmark/admin/start
-	name = "Corvette Hangar"
-	landmark_tag = "nav_admin_start"
-	docking_controller = "admin_shuttle_bay"
-	base_turf = /turf/unsimulated/floor/plating
-	base_area = /area/centcom
-
-/obj/effect/shuttle_landmark/admin/green
-	name = "Emergency Services Dock"
-	landmark_tag = "nav_admin_green"
-	docking_controller = "green_dock_north"
-	landmark_flags = SLANDMARK_FLAG_AUTOSET
-
-/obj/effect/shuttle_landmark/admin/command
-	name = "Command Surface Dock"
-	landmark_tag = "nav_admin_command"
-	docking_controller = "admin_shuttle_dock_airlock"
-	landmark_flags = SLANDMARK_FLAG_AUTOSET
-
 //-// CCIA Shuttle //-//
 
 /datum/shuttle/autodock/ferry/autoreturn/ccia
@@ -227,7 +194,7 @@ AURORA_ESCAPE_POD(4)
 	warmup_time = 10
 	shuttle_area = /area/shuttle/specops
 	dock_target = "specops_shuttle_port"
-	waypoint_station = "nav_ert_dock"
+	waypoint_station = "nav_horizon_dock_deck_3_port_5"
 	waypoint_offsite = "nav_ert_start"
 
 /obj/effect/shuttle_landmark/ert/start
@@ -239,7 +206,7 @@ AURORA_ESCAPE_POD(4)
 
 /obj/effect/shuttle_landmark/ert/dock
 	name = "Third Deck Port Dock 3"
-	landmark_tag = "nav_ert_dock"
+	landmark_tag = "nav_horizon_dock_deck_3_port_5"
 	docking_controller = "specops_dock_airlock"
 	special_dock_targets = list("Phoenix Shuttle" = "specops_shuttle_fore")
 	landmark_flags = SLANDMARK_FLAG_AUTOSET

maps/sccv_horizon/code/sccv_horizon.dm

@@ -115,6 +115,7 @@
 		/datum/shuttle/autodock/multi/antag/merc_ship,
 		/datum/shuttle/autodock/multi/legion,
 		/datum/shuttle/autodock/multi/distress,
+		/datum/shuttle/autodock/multi/crescent,
 		/datum/shuttle/autodock/overmap/intrepid,
 		/datum/shuttle/autodock/overmap/mining,
 		/datum/shuttle/autodock/overmap/canary,

maps/sccv_horizon/code/sccv_horizon_shuttles.dm

@@ -197,3 +197,22 @@
 	docking_controller = "cargo_shuttle_dock"
 	base_turf = /turf/simulated/floor/plating
 	base_area = /area/hangar/operations
+
+//-// Admin Corvette //-//
+/datum/shuttle/autodock/multi/crescent
+	name = "ICV Crescent"
+	current_location = "nav_crescent_start"
+	warmup_time = 10
+	shuttle_area = /area/shuttle/hapt
+	dock_target = "crescent_shuttle"
+	destination_tags = list(
+		"nav_crescent_start",
+		"nav_horizon_dock_deck_3_starboard_2"
+		)
+
+/obj/effect/shuttle_landmark/crescent/start
+	name = "Corvette Hangar"
+	landmark_tag = "nav_crescent_start"
+	docking_controller = "crescent_shuttle_bay"
+	base_turf = /turf/unsimulated/floor/plating
+	base_area = /area/centcom