Shuttle update: Part Two: The Legion Protects (#7457)

code/game/objects/effects/decals/contraband.dm

@@ -82,6 +82,7 @@
 	name = "poster"
 	desc = "A large piece of space-resistant printed paper. "
 	icon = 'icons/obj/contraband.dmi'
+	icon_state = "poster_map"
 	anchored = 1
 	var/serial_number	//Will hold the value of src.loc if nobody initialises it
 	var/poster_type		//So mappers can specify a desired poster

code/game/objects/effects/decals/misc.dm

@@ -15,3 +15,12 @@
 	density = 0
 	anchored = 1
 	layer = 50
+
+//Used for imitating an object's sprite for decorative purposes.
+/obj/effect/decal/fake_object
+	name = "object"
+	icon = 'icons/obj/structures.dmi'
+	icon_state = "ladder11"
+	density = 0
+	anchored = 1
+	layer = 3

code/game/objects/effects/decals/posters/bs12.dm

@@ -328,3 +328,18 @@
 	icon_state = "bsposter66"
 	name = "BFG 9000"
 	desc = "A picture of a big freakin' gun."
+
+/datum/poster/bay_67
+	icon_state = "tcflposter"
+	name = "Tau Ceti Foreign Legion"
+	desc = "A TCFL recruitment poster."
+
+/datum/poster/bay_68
+	icon_state = "tcflposter2"
+	name = "Tau Ceti Foreign Legion"
+	desc = "A TCFL recruitment poster showcasing the benefits Synthetics gain when enlisting."
+
+/datum/poster/bay_69
+	icon_state = "grillposter"
+	name = "grill"
+	desc = "A poster of a smug looking tajaran grilling at a company get-together."

code/game/objects/items/devices/magnetic_lock.dm

@@ -41,6 +41,15 @@
 	req_access = null
 	req_one_access = list(access_engine_equip, access_atmospherics)
 
+/obj/item/device/magnetic_lock/security/legion
+	name = "legion magnetic door lock"
+	req_access = (access_legion)
+	w_class = 2
+
+/obj/item/device/magnetic_lock/security/legion/Initialize()
+	..()
+	desc = "A large, ID locked device used for completely locking down airlocks. This one carries the insignia of the Tau Ceti Foreign Legion."
+
 /obj/item/device/magnetic_lock/Initialize()
 	. = ..()
 
@@ -470,7 +479,7 @@
 			ui = new(user, src, "misc-maglock", 300, 100, "Maglock", list())
 		else
 			ui = new(user, src, "misc-maglock-config", 300, 100, "Maglock configuration", list("passcode" = passcode))
-	
+
 	ui.open()
 
 /obj/item/device/magnetic_lock/keypad/attack_hand(var/mob/user)

code/game/objects/items/weapons/cards_ids.dm

@@ -461,6 +461,7 @@ var/const/NO_EMAG_ACT = -50
 /obj/item/card/id/distress/legion
 	name = "\improper Tau Ceti Foreign Legion ID"
 	assignment = "Tau Ceti Foreign Legion Volunteer"
+	icon_state = "legion"
 
 /obj/item/card/id/distress/legion/New()
 	access = list(access_legion, access_maint_tunnels, access_external_airlocks, access_security, access_engine, access_engine_equip, access_medical, access_research, access_atmospherics, access_medical_equip)

code/game/objects/items/weapons/shields.dm

@@ -243,8 +243,8 @@
 	name = "tactical shield"
 	desc = "A highly advanced ballistic shield crafted from durable materials and plated ablative panels. Can be collapsed for mobility."
 	icon = 'icons/obj/tactshield.dmi'
-	icon_state = "tactshield0"
-	item_state = "tactshield0"
+	icon_state = "tactshield"
+	item_state = "tactshield"
 	contained_sprite = 1
 	force = 3.0
 	throwforce = 3.0
@@ -254,6 +254,12 @@
 	attack_verb = list("shoved", "bashed")
 	var/active = 0
 
+/obj/item/shield/riot/tact/legion
+	name = "legion ballistic shield"
+	desc = "A highly advanced ballistic shield crafted from durable materials and plated ablative panels. Can be collapsed for mobility. This one has been painted in the colors of the Tau Ceti Foreign Legion."
+	icon_state = "legion_tactshield"
+	item_state = "legion_tactshield"
+
 /obj/item/shield/riot/tact/handle_shield(mob/user)
 	if(!active)
 		return 0 //turn it on first!
@@ -264,24 +270,26 @@
 
 /obj/item/shield/riot/tact/attack_self(mob/living/user)
 	active = !active
-	icon_state = "tactshield[active]"
-	item_state = "tactshield[active]"
 	playsound(src.loc, 'sound/weapons/empty.ogg', 50, 1)
 
 	if(active)
+		icon_state = "[initial(icon_state)]_[active]"
+		item_state = "[initial(item_state)]_[active]"
 		force = 5
 		throwforce = 5
 		throw_speed = 2
 		w_class = 4
 		slot_flags = SLOT_BACK
-		to_chat(user, "<span class='notice'>You extend \the [src] downward with a sharp snap of your wrist.</span>")
+		to_chat(user, span("notice","You extend \the [src] downward with a sharp snap of your wrist."))
 	else
+		icon_state = "[initial(icon_state)]"
+		item_state = "[initial(item_state)]"
 		force = 3
 		throwforce = 3
 		throw_speed = 3
 		w_class = 3
 		slot_flags = 0
-		to_chat(user, "<span class='notice'>\The [src] folds inwards neatly as you snap your wrist upwards and push it back into the frame.</span>")
+		to_chat(user, span("notice","\The [src] folds inwards neatly as you snap your wrist upwards and push it back into the frame."))
 
 	if(istype(user,/mob/living/carbon/human))
 		var/mob/living/carbon/human/H = user
@@ -290,4 +298,3 @@
 
 	add_fingerprint(user)
 	return
-

code/game/objects/items/weapons/swords_axes_etc.dm

@@ -50,7 +50,7 @@
 		"<span class='warning'>You extend the baton.</span>",\
 		"You hear an ominous click.")
 		icon_state = "telebaton_1"
-		item_state = "nullrod"
+		item_state = "telebaton_1"
 		w_class = 3
 		force = 15//quite robust
 		attack_verb = list("smacked", "struck", "slapped")

code/game/objects/random/random.dm

@@ -1321,3 +1321,39 @@
 		/obj/structure/largecrate/animal/adhomai/rafama = 0.5,
 		/obj/structure/largecrate/animal/hakhma = 0.5
 	)
+
+/obj/random/random_flag
+	name = "random flag"
+	desc = "Contains a random boxed flag or banner."
+	icon = 'icons/obj/decals.dmi'
+	icon_state = "flag_boxed"
+	spawnlist = list(
+		/obj/item/flag/biesel,
+		/obj/item/flag/biesel/l,
+		/obj/item/flag/dominia,
+		/obj/item/flag/dominia/l,
+		/obj/item/flag/dpra,
+		/obj/item/flag/dpra/l,
+		/obj/item/flag/elyra,
+		/obj/item/flag/elyra/l,
+		/obj/item/flag/eridani,
+		/obj/item/flag/eridani/l,
+		/obj/item/flag/hegemony,
+		/obj/item/flag/hegemony/l,
+		/obj/item/flag/heph,
+		/obj/item/flag/heph/l,
+		/obj/item/flag/jargon,
+		/obj/item/flag/jargon/l,
+		/obj/item/flag/nanotrasen,
+		/obj/item/flag/nanotrasen/l,
+		/obj/item/flag/nka,
+		/obj/item/flag/nka/l,
+		/obj/item/flag/pra,
+		/obj/item/flag/pra/l,
+		/obj/item/flag/sol,
+		/obj/item/flag/sol/l,
+		/obj/item/flag/vaurca,
+		/obj/item/flag/vaurca/l,
+		/obj/item/flag/zenghu,
+		/obj/item/flag/zenghu/l
+	)

code/game/objects/structures/crates_lockers/crates.dm

@@ -526,6 +526,15 @@
 	icon_opened = "weaponcrateopen"
 	icon_closed = "weaponcrate"
 
+/obj/structure/closet/crate/secure/legion
+	name = "foreign legion supply crate"
+	desc = "A secure supply crate, It carries the insignia of the Tau Ceti Foreign Legion. It appears quite scuffed."
+	icon_state = "tcflcrate"
+	icon_opened = "tcflcrateopen"
+	icon_closed = "tcflcrate"
+	req_access = list(access_legion)
+	layer = OBJ_LAYER - 0.01
+
 /obj/structure/closet/crate/secure/phoron
 	name = "phoron crate"
 	desc = "A secure phoron crate."

code/game/objects/structures/signs.dm

@@ -590,6 +590,26 @@
 	var/flag_path
 	var/flag_size = 0
 
+/obj/structure/sign/flag/biesel
+	name = "Republic of Biesel flag"
+	desc = "The colours and symbols of the Republic of Biesel."
+	icon_state = "biesel"
+
+/obj/structure/sign/flag/biesel/left
+	icon_state = "biesel_l"
+
+/obj/structure/sign/flag/biesel/right
+	icon_state = "biesel_r"
+
+/obj/item/flag/biesel
+	name = "Republic of Biesel flag"
+	desc = "The flag representing the Republic of Biesel."
+	flag_path = "biesel"
+
+/obj/item/flag/biesel/l
+	name = "Large Republic of Biesel flag"
+	flag_size = 1
+
 /obj/item/flag/afterattack(var/atom/A, var/mob/user, var/adjacent, var/clickparams)
 	if (!adjacent)
 		return

code/game/objects/structures/stool_bed_chair_nest/chairs.dm

@@ -189,6 +189,19 @@
 	icon_state = "bridge"
 	anchored = 1
 
+/obj/structure/bed/chair/office/bridge/legion
+	name = "legion pilot seat"
+	desc = "A comfortable seat for a pilot."
+	icon_state = "bridge_legion"
+
+/obj/structure/bed/chair/office/bridge/generic
+	icon_state = "bridge_generic"
+
+/obj/structure/bed/chair/office/bridge/pilot
+	name = "pilot seat"
+	desc = "A comfortable seat for a pilot."
+	icon_state = "pilot"
+
 /obj/structure/bed/chair/office/Initialize()
 	. = ..()
 	var/image/I = image(icon, "[icon_state]_over")

code/game/objects/structures/window.dm

@@ -494,6 +494,12 @@
 	smooth = SMOOTH_TRUE
 	can_be_unanchored = TRUE
 
+/obj/structure/window/shuttle/legion
+	name = "cockpit window"
+	icon = 'icons/obj/smooth/shuttle_window_legion.dmi'
+	health = 160
+	maxhealth = 160
+
 /obj/structure/window/shuttle/crescent
 	desc = "It looks rather strong."