Merge branch 'master' of https://github.com/Draggeru/NovaSector

_maps/RandomRuins/IceRuins/nova/icemoon_underground_interdyne_base1.dmm

@@ -7469,6 +7469,12 @@
 	fixed_underlay = list(icon='icons/turf/snow.dmi', icon_state="snow")
 	},
 /area/ruin/interdyne_planetary_base)
+"Wq" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/interdyne_planetary_base/main/dorms)
 "WQ" = (
 /obj/structure/shipping_container/donk_co{
 	pixel_x = 6
@@ -8766,7 +8772,7 @@ ko
 kF
 lg
 ll
-lz
+Wq
 lZ
 mT
 mT

_maps/map_files/NSVBlueshift/Blueshift.dmm

@@ -5976,7 +5976,7 @@
 	id = "cargounload"
 	},
 /obj/machinery/door/poddoor{
-	id = "cargounload";
+	id = "QMLoaddoor2";
 	name = "Supply Dock Unloading Door"
 	},
 /turf/open/floor/iron/dark,
@@ -31539,7 +31539,7 @@
 	id = "cargoload"
 	},
 /obj/machinery/door/poddoor{
-	id = "cargoload";
+	id = "QMLoaddoor";
 	name = "Supply Dock Loading Door"
 	},
 /turf/open/floor/iron/dark,
@@ -88440,13 +88440,13 @@
 /area/station/medical/medbay/central)
 "qWS" = (
 /obj/machinery/button/door{
-	id = "cargounload";
+	id = "QMLoaddoor2";
 	name = "Loading Doors";
 	pixel_x = 24;
 	pixel_y = -8
 	},
 /obj/machinery/button/door{
-	id = "cargoload";
+	id = "QMLoaddoor";
 	name = "Loading Doors";
 	pixel_x = 24;
 	pixel_y = 8
@@ -168287,7 +168287,7 @@ eym
 kGC
 gaG
 aYi
-kGC
+ilS
 aYi
 bka
 kGC

_maps/map_files/Snowglobe/snowglobe.dmm

@@ -9281,7 +9281,7 @@
 	id = "cargoload"
 	},
 /obj/machinery/door/poddoor{
-	id = "cargoload";
+	id = "QMLoaddoor";
 	name = "Supply Dock Loading Door"
 	},
 /obj/structure/plasticflaps,
@@ -57630,7 +57630,7 @@
 	id = "cargoload"
 	},
 /obj/machinery/door/poddoor{
-	id = "cargoload";
+	id = "QMLoaddoor";
 	name = "Supply Dock Loading Door"
 	},
 /turf/open/floor/plating,
@@ -66425,7 +66425,7 @@
 	id = "cargounload"
 	},
 /obj/machinery/door/poddoor{
-	id = "cargounload";
+	id = "QMLoaddoor2";
 	name = "Supply Dock Unloading Door"
 	},
 /obj/structure/plasticflaps,
@@ -82837,7 +82837,7 @@
 	id = "cargounload"
 	},
 /obj/machinery/door/poddoor{
-	id = "cargounload";
+	id = "QMLoaddoor2";
 	name = "Supply Dock Unloading Door"
 	},
 /turf/open/floor/plating,
@@ -84760,13 +84760,13 @@
 /obj/structure/table/reinforced,
 /obj/machinery/button/door/directional/west{
 	pixel_y = -3;
-	id = "cargoload";
+	id = "QMLoaddoor";
 	name = "Loading Blast Doors";
 	pixel_x = -6
 	},
 /obj/machinery/button/door/directional/west{
 	pixel_y = 7;
-	id = "cargounload";
+	id = "QMLoaddoor2";
 	name = "Unloading Blast Doors";
 	pixel_x = -6
 	},

_maps/map_files/VoidRaptor/VoidRaptor.dmm

@@ -27936,12 +27936,12 @@
 	},
 /obj/effect/turf_decal/bot,
 /obj/machinery/button/door/directional/east{
-	id = 68;
+	id = "QMLoaddoor";
 	name = "Unloading Doors";
 	pixel_y = 6
 	},
 /obj/machinery/button/door/directional/east{
-	id = 69;
+	id = "QMLoaddoor2";
 	name = "Loading Doors";
 	pixel_y = -6
 	},
@@ -55123,7 +55123,7 @@
 	id = "cargounload"
 	},
 /obj/machinery/door/poddoor{
-	id = 68;
+	id = "QMLoaddoor";
 	name = "Supply Dock Unloading Door"
 	},
 /turf/open/floor/iron/smooth_large,
@@ -66521,7 +66521,7 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/door/poddoor{
-	id = 69;
+	id = "QMLoaddoor2";
 	name = "Supply Dock Loading Door"
 	},
 /turf/open/floor/iron/smooth_large,

_maps/map_files/generic/CentCom_nova_z2.dmm

@@ -9134,6 +9134,10 @@
 	},
 /turf/open/floor/wood,
 /area/centcom/holding/cafedorms)
+"jBZ" = (
+/obj/machinery/vending/wardrobe/syndie_wardrobe/interdyne/ghost_cafe,
+/turf/open/misc/dirt/planet,
+/area/centcom/holding/cafepark)
 "jCs" = (
 /obj/effect/turf_decal/tile/neutral{
 	dir = 1
@@ -9654,10 +9658,6 @@
 /turf/open/floor/wood,
 /area/centcom/interlink)
 "kHZ" = (
-/obj/structure/spacevine{
-	name = "thick vines";
-	opacity = 1
-	},
 /obj/machinery/vending/wardrobe/sec_wardrobe/red,
 /turf/open/misc/dirt/planet,
 /area/centcom/holding/cafepark)
@@ -70890,7 +70890,7 @@ ayI
 ayI
 ayI
 ayI
-ayI
+aPf
 aPf
 aPf
 aPf
@@ -71147,7 +71147,7 @@ aPf
 ayI
 ayI
 ayI
-ayI
+jBZ
 ovH
 rUA
 qBC

_maps/shuttles/nova/cargo_nova_delta.dmm

@@ -98,7 +98,7 @@
 	id = "cargounload"
 	},
 /obj/machinery/door/poddoor{
-	id = "cargounload";
+	id = "QMLoaddoor";
 	name = "Supply Dock Unloading Door"
 	},
 /turf/open/floor/plating,
@@ -139,7 +139,7 @@
 /area/shuttle/supply)
 "Gf" = (
 /obj/machinery/door/poddoor{
-	id = "cargoload";
+	id = "QMLoaddoor2";
 	name = "Supply Dock Loading Door"
 	},
 /obj/machinery/conveyor{

code/modules/cargo/bounties/assistant.dm

@@ -1,9 +1,12 @@
+/* NOVA EDIT REMOVAL START - Removes bounties that are luck or destruction based
 /datum/bounty/item/assistant/strange_object
 	name = "Strange Object"
 	description = "Nanotrasen has taken an interest in strange objects. Find one in maintenance, and ship it off to CentCom right away."
 	reward = CARGO_CRATE_VALUE * 2.4
 	wanted_types = list(/obj/item/relic = TRUE)
+*/ // NOVA EDIT REMOVAL END 
 
+/* NOVA EDIT REMOVAL START - Removes bounties, these are just boring.
 /datum/bounty/item/assistant/scooter
 	name = "Scooter"
 	description = "Nanotrasen has determined walking to be wasteful. Ship a scooter to CentCom to speed operations up."
@@ -19,19 +22,22 @@
 		/obj/vehicle/ridden/scooter/skateboard = TRUE,
 		/obj/item/melee/skateboard = TRUE,
 	)
+*/ // NOVA EDIT REMOVAL END 
 
 /datum/bounty/item/assistant/stunprod
 	name = "Stunprod"
 	description = "CentCom demands a stunprod to use against dissidents. Craft one, then ship it."
 	reward = CARGO_CRATE_VALUE * 2.6
 	wanted_types = list(/obj/item/melee/baton/security/cattleprod = TRUE)
 
+/* NOVA EDIT REMOVAL START - Removes bounties that are luck or destruction based
 /datum/bounty/item/assistant/soap
 	name = "Soap"
 	description = "Soap has gone missing from CentCom's bathrooms and nobody knows who took it. Replace it and be the hero CentCom needs."
 	reward = CARGO_CRATE_VALUE * 4
 	required_count = 3
 	wanted_types = list(/obj/item/soap = TRUE)
+*/ // NOVA EDIT REMOVAL END 
 
 /datum/bounty/item/assistant/spear
 	name = "Spears"
@@ -53,6 +59,7 @@
 	reward = CARGO_CRATE_VALUE * 4
 	wanted_types = list(/obj/structure/statue = TRUE)
 
+/* NOVA EDIT REMOVAL START - Removes bounties that are luck or destruction based
 /datum/bounty/item/assistant/clown_box
 	name = "Clown Box"
 	description = "The universe needs laughter. Stamp cardboard with a clown stamp and ship it out."
@@ -65,6 +72,7 @@
 	reward = CARGO_CRATE_VALUE * 2.4
 	required_count = 3
 	wanted_types = list(/obj/item/food/cheesiehonkers = TRUE)
+*/ // NOVA EDIT REMOVAL END 
 
 /datum/bounty/item/assistant/baseball_bat
 	name = "Baseball Bat"
@@ -99,12 +107,14 @@
 	reward = CARGO_CRATE_VALUE * 3
 	wanted_types = list(/obj/item/stack/sheet/animalhide/monkey = TRUE)
 
+/* NOVA EDIT REMOVAL START - Removes bounties that are luck or destruction based
 /datum/bounty/item/assistant/dead_mice
 	name = "Dead Mice"
 	description = "Station 14 ran out of freeze-dried mice. Ship some fresh ones so their janitor doesn't go on strike."
 	reward = CARGO_CRATE_VALUE * 10
 	required_count = 5
 	wanted_types = list(/obj/item/food/deadmouse = TRUE)
+*/ // NOVA EDIT REMOVAL END 
 
 /datum/bounty/item/assistant/comfy_chair
 	name = "Comfy Chairs"
@@ -129,12 +139,14 @@
 	wanted_types = list(/obj/item/food/grown/poppy = TRUE)
 	include_subtypes = FALSE
 
+/* NOVA EDIT REMOVAL START - Removes bounties that are luck or destruction based
 /datum/bounty/item/assistant/potted_plants
 	name = "Potted Plants"
 	description = "Central Command is looking to commission a new BirdBoat-class station. You've been ordered to supply the potted plants."
 	reward = CARGO_CRATE_VALUE * 4
 	required_count = 8
 	wanted_types = list(/obj/item/kirbyplants = TRUE)
+*/ // NOVA EDIT REMOVAL END 
 
 /datum/bounty/item/assistant/monkey_cubes
 	name = "Monkey Cubes"
@@ -150,6 +162,7 @@
 	required_count = 3
 	wanted_types = list(/obj/item/grenade/iedcasing = TRUE)
 
+/* NOVA EDIT REMOVAL START - Removes bounties that are luck or destruction based
 /datum/bounty/item/assistant/corgimeat
 	name = "Raw Corgi Meat"
 	description = "The Syndicate recently stole all of CentCom's corgi meat. Ship out a replacement immediately."
@@ -176,6 +189,7 @@
 	reward = CARGO_CRATE_VALUE * 4
 	required_count = 24
 	wanted_types = list(/obj/item/toy/crayon = TRUE)
+*/ // NOVA EDIT REMOVAL END 
 
 /datum/bounty/item/assistant/pens
 	name = "Pens"

html/changelogs/AutoChangeLog-pr-4552.yml

@@ -0,0 +1,4 @@
+author: "GoldenAlpharex"
+delete-after: True
+changes:
+  - bugfix: "Fixes a donator's item not being available to them in the loadout menu."

html/changelogs/archive/2024-11.yml

@@ -1,3 +1,38 @@
 2024-11-01:
   Draggeru:
   - rscadd: Adds a donator reward for DprMstr
+  MajManatee:
+  - bugfix: Hiss Emote+ button works again
+  Neocloudy:
+  - image: Nova retinal projectors have had their sprites adjusted so they hopefully
+      clip through hairstyles, headwear, etc less often!
+  OrbisAnima:
+  - rscadd: Adds a new multitool, the 'full override control kit', which aside from
+      working as a regular multitool, allows the user to hack open or unlock APC's
+      and Air Alarms. They do so rather aggresively, so it can break them with enough
+      uses. They can be obtained from the premium section of YouTool or from broad
+      band enabled AKH Frontier Imports.
+  - qol: YouTool vendors premium section now holds the F.O.C.K., as well as a small
+      selection of AKH frontier hand held devices. It is said that some vendors are
+      being used to smuggle Prybars though. Multitools are now being sold at a discount!
+  - balance: Prybars can no longer be made in the Rapid Construction Fabricator, Large
+      Crowbars now instead take their place, removing the heavy taxes on the RCF and
+      making it no longer restricted.
+  - rscadd: 'Bounties removed: Scooter, Skateboard, Soap, Clown Box, Cheesie Honkers,
+      Dead Mice, Potted Plants, Corgi Meat, Action Figures, Paper Bins, Crayons.'
+  - rscdel: 'Bounties added: Nuggies, Cardboard ID''s, Glass Bowl, Clay Crafts, Forged
+      Dagger, Two Wheelchairs, Flood Light, Mannequin and Black Market Uplink.'
+  SpaghettiTerrible:
+  - bugfix: vibrating egg frequency can now be adjusted
+  sqnztb:
+  - bugfix: blueshift's cargo shuttle buttons are more accessible now.
+  - rscadd: Interdyne has a new trim icon for it's scientists and shaft miners, as
+      well as a new color palette.
+2024-11-03:
+  A.C.M.O.:
+  - rscadd: Added the Primidine Starfruit. The seed pack is available in the supply
+      console imports category.
+  Hardly:
+  - map: Added Interdrobe to the ghost cafe
+  - map: Removed the vine on redsec's vendor in ghost cafe
+  - bugfix: Icebox Interdyne's library is now connected with the powernet

modular_nova/master_files/code/datums/id_trim/syndicate.dm

@@ -89,16 +89,18 @@
 /// Interdyne
 
 /datum/id_trim/syndicom/nova/interdyne
+	trim_icon = 'modular_nova/master_files/icons/obj/card.dmi'
 	assignment = "Interdyne Scientist"
+	trim_state = "trim_interdyne"
+	department_color = COLOR_LIME
+	subdepartment_color = COLOR_VERY_DARK_LIME_GREEN
 	threat_modifier = 2 // Interdyne is allowed on station, so this'll get beepskys off them.
 
 /datum/id_trim/syndicom/nova/interdyne/shaftminer
 	assignment = "Interdyne Shaft Miner"
 
 /datum/id_trim/syndicom/nova/interdyne/deckofficer
-	trim_icon = 'modular_nova/master_files/icons/obj/card.dmi'
 	assignment = "Deck Officer"
 	trim_state = "trim_deckofficer"
-	department_color = COLOR_COMMAND_BLUE
-	subdepartment_color = COLOR_CARGO_BROWN
+	department_color = COLOR_VERY_DARK_LIME_GREEN
 	access = list(ACCESS_SYNDICATE, ACCESS_ROBOTICS, ACCESS_SYNDICATE_LEADER)

modular_nova/master_files/code/modules/mob_spawn/ghost_roles/mining_roles.dm

@@ -176,7 +176,7 @@
 	uniform = /obj/item/clothing/under/syndicate/nova/interdyne/miner
 	suit = /obj/item/clothing/suit/syndicate/interdyne_jacket
 	r_pocket = /obj/item/storage/bag/ore
-	id_trim = /datum/id_trim/syndicom/nova/interdyne
+	id_trim = /datum/id_trim/syndicom/nova/interdyne/shaftminer
 	back = /obj/item/storage/backpack/explorer
 	backpack_contents = list(
 		/obj/item/storage/box/survival/interdyne=1,