Merge branch 'master' into AG80

code/game/objects/items/props/helmetgarb.dm

@@ -20,7 +20,6 @@
 	name = "combat netting"
 	desc = "Probably combat netting for a helmet. Probably just an extra hairnet that got ordered for the phantom Almayer cooking staff. Probably useless."
 	icon_state = "netting"
-	flags_obj = OBJ_NO_HELMET_BAND
 
 /obj/item/prop/helmetgarb/spent_buckshot
 	name = "spent buckshot"
@@ -52,13 +51,11 @@
 	name = "raincover"
 	desc = "The standard M10 combat helmet is already water-resistant at depths of up to 10 meters. This makes the top potentially water-proof. At least it's something."
 	icon_state = "raincover"
-	flags_obj = OBJ_NO_HELMET_BAND
 
 /obj/item/prop/helmetgarb/camocover
 	name = "jungle helmet cover"
 	desc = "A cover that goes over the top of an M10 pattern helmet to camoflauge it without needing the use of paints."
 	icon_state = "camocover"
-	flags_obj = OBJ_NO_HELMET_BAND
 
 /obj/item/prop/helmetgarb/camocover/snow
 	name = "snow helmet cover"

code/game/objects/items/stacks/flags.dm

@@ -278,10 +278,28 @@
 
 /obj/structure/flag/plantable/ua
 	name = "\improper United Americas flag"
-	desc = "The flag of the United Americas. Semper fi."
+	desc = "The flag of the United Americas."
 	icon_state = "flag_ua_planted"
 	flag_type = /obj/item/flag/plantable/ua
 
+// UNITED STATES OF AMERICA FLAG //
+//////////////////////////
+
+/obj/item/flag/plantable/usa
+	name = "\improper United States of America flag"
+	desc = "The flag of the United States of America. This one looks ready to be planted into the ground."
+	icon = 'icons/obj/structures/plantable_flag.dmi'
+	icon_state = "flag_usa"
+	flag_type = /obj/structure/flag/plantable/usa
+	faction = FACTION_MARINE
+
+/obj/structure/flag/plantable/usa
+	name = "\improper United States of America flag"
+	desc = "The flag of the United States of America. God Bless these United States."
+	icon_state = "flag_usa_planted"
+	flag_type = /obj/item/flag/plantable/usa
+
+
 // UNION OF PROGRESSIVE PEOPLES FLAG //
 //////////////////////////
 

code/modules/clothing/head/helmet.dm

@@ -286,7 +286,7 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
 
 	// PREFERENCES GEAR
 	/obj/item/prop/helmetgarb/gunoil = "gunoil",
-	/obj/item/prop/helmetgarb/netting = HELMET_GARB_RELAY_ICON_STATE,
+	/obj/item/prop/helmetgarb/netting = "netting",
 	/obj/item/prop/helmetgarb/spent_buckshot = "spent_buckshot",
 	/obj/item/prop/helmetgarb/spent_slug = "spent_slug",
 	/obj/item/prop/helmetgarb/spent_flech = "spent_flech",

code/modules/reagents/chemistry_reagents/drink.dm

@@ -376,7 +376,6 @@
 /datum/reagent/drink/coffee/on_mob_life(mob/living/M)
 	. = ..()
 	if(!.) return
-	M.make_jittery(5)
 	if(adj_temp > 0 && holder)
 		holder.remove_reagent("frostoil", 10*REAGENTS_METABOLISM)
 

code/modules/shuttle/computers/dropship_computer.dm

@@ -5,7 +5,7 @@
 	icon_state = "console"
 	unacidable = TRUE
 	exproof = TRUE
-	needs_power = FALSE
+	needs_power = TRUE //Standalone terminal is gonna be reliant on area power, we don't need to really care for balance r.e. xenos remote-hijacking a bird
 	var/override_being_removed = FALSE
 
 	// Admin disabled
@@ -631,3 +631,56 @@
 	icon = 'icons/obj/structures/machinery/computer.dmi'
 	icon_state = "cameras_old"
 
+/obj/structure/machinery/computer/shuttle/dropship/flight/laptop
+	name = "\improper Dropship Remote-Flight Laptop"
+	desc = "A laptop loaded with flight control software that has a customized keyboard."
+	icon = 'icons/obj/structures/machinery/computer.dmi'
+	icon_state = "remoteflightcomp"
+	density = FALSE
+	is_remote = TRUE
+	layer = UPPER_ITEM_LAYER
+	needs_power = FALSE
+	can_change_shuttle = TRUE
+	var/source_type = /obj/item/device/flight_laptop
+
+/obj/structure/machinery/computer/shuttle/dropship/flight/laptop/MouseDrop(over_object)
+	if(over_object == usr && Adjacent(usr))
+		if(!skillcheck(usr, SKILL_PILOT, SKILL_PILOT_UNTRAINED))
+			to_chat(usr, SPAN_WARNING("You do not know how to safely shut down the [src]..."))
+			return
+		else
+			usr.visible_message(SPAN_NOTICE("[usr] starts shutting down and packing up [src]."), \
+			SPAN_NOTICE("You begin to shut down and pack up [src]..."))
+			do_after(usr, 3 SECONDS, INTERRUPT_NO_NEEDHAND, BUSY_ICON_FRIENDLY, src)
+			playsound(usr, 'sound/machines/terminal_off.ogg', 25, FALSE)
+			collapse()
+
+/obj/structure/machinery/computer/shuttle/dropship/flight/laptop/proc/collapse(mob/living/carbon/human/user)
+	var/obj/item/device/flight_laptop = new source_type(loc)
+	if(istype(user))
+		user.visible_message(SPAN_NOTICE("[user] shuts down and packs up [src]."),
+			SPAN_NOTICE("You quickly shut down and pack up [src]."))
+		user.put_in_active_hand(flight_laptop)
+	qdel(src)
+
+// Flight laptop in hands
+/obj/item/device/flight_laptop
+	name = "\improper Dropship Remote-Flight Laptop"
+	desc = "A laptop loaded with flight control software that has a customized keyboard, all packed into an ultra-tough carry case."
+	icon = 'icons/obj/structures/machinery/computer.dmi'
+	icon_state = "remoteflightcomp_cl"
+	w_class = SIZE_SMALL
+	unacidable = TRUE
+	has_special_table_placement = TRUE
+
+/obj/item/device/flight_laptop/set_to_table(obj/structure/surface/target)
+	if (do_after(usr, 1 SECONDS, INTERRUPT_NO_NEEDHAND, BUSY_ICON_GENERIC))
+		var/obj/structure/machinery/computer/shuttle/dropship/flight/laptop/deployed = new(target.loc)
+		usr.visible_message(SPAN_NOTICE("[usr] sets up [deployed]."), \
+			SPAN_NOTICE("You quickly set up [deployed] on the table."))
+		qdel(src)
+	else
+		to_chat(usr, SPAN_WARNING("You fail to setup the [src]"))
+
+/obj/item/device/flight_laptop/ex_act()
+	return

code/modules/vehicles/interior/interactable/vehicle_locker.dm

@@ -35,7 +35,8 @@
 									/obj/item/device/motiondetector,
 									/obj/item/ammo_magazine/hardpoint,
 									/obj/item/tool/weldpack,
-									/obj/item/ammo_box/magazine
+									/obj/item/ammo_box,
+									/obj/item/storage/box
 									)
 	flags_atom |= USES_HEARING
 

html/changelogs/AutoChangeLog-pr-593.yml

@@ -0,0 +1,6 @@
+author: "BonniePandora"
+delete-after: True
+changes:
+  - rscadd: "Adds in a new method of remotely calling in the dropship; a movielike laptop in a carry case that has it's own internal power supply"
+  - balance: "Standalone remote-flight computers now rely upon area power"
+  - imageadd: "Sprites for the above, item, deployed & off/inactive and deployed & on/active"

html/changelogs/AutoChangeLog-pr-663.yml

@@ -0,0 +1,4 @@
+author: "SpartanBobby"
+delete-after: True
+changes:
+  - rscadd: "Changed the APC storage container to be able to fit more stuff"

html/changelogs/AutoChangeLog-pr-669.yml

@@ -0,0 +1,4 @@
+author: "AmoryBlaine"
+delete-after: True
+changes:
+  - bugfix: "Helmet cover layering, cigarette garb sprites"

html/changelogs/AutoChangeLog-pr-671.yml

@@ -0,0 +1,4 @@
+author: "The32bitguy"
+delete-after: True
+changes:
+  - rscdel: "Coffee only makes a human jittery at a critical-OD threshold, not from a consecutive > 20 units."

html/changelogs/AutoChangeLog-pr-674.yml

@@ -0,0 +1,4 @@
+author: "AmoryBlaine"
+delete-after: True
+changes:
+  - rscadd: "USA flag"