diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index 2dc357ad9478..e6400198864e 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -559,11 +559,17 @@ item_state = "solgov_envirohelm" /obj/item/clothing/head/helmet/operator - name = "\improper Operator helmet" + name = "\improper operator helmet" desc = "A robust combat helmet commonly employed by Syndicate forces, regardless of alignment." icon_state = "operator" item_state = "operator" +/obj/item/clothing/head/helmet/medical + name = "\improper trauma team helmet" + desc = "A robust combat helmet commonly employed by cybersun medical trauma teams, with its distinctive turquoise." + icon_state = "traumahelm" + item_state = "traumahelm" + /obj/item/clothing/head/helmet/bulletproof/m10 name = "\improper M10 pattern Helmet" desc = "A classic looking helmet, derived from numerous convergently-similar designs from all across inhabited space. A faded tag reads: 'The difference between an open-casket and closed-casket funeral. Wear on head for best results.'" diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index 126a8c0edffa..ae7ecd5b121e 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -184,6 +184,12 @@ name = "syndicate cap" desc = "A black cap fit for a high ranking syndicate officer." +/obj/item/clothing/head/HoS/cybersun + name = "cybersun hat" + desc = "A crimson-red hat fit for a high ranking cybersun officer." + icon_state = "cybersunhat" + item_state = "cybersunhat" + /obj/item/clothing/head/HoS/beret/syndicate name = "syndicate beret" desc = "A black beret with thick armor padding inside. Stylish and robust." diff --git a/code/modules/clothing/head/soft_caps.dm b/code/modules/clothing/head/soft_caps.dm index dd689223380c..bc2036523bd7 100644 --- a/code/modules/clothing/head/soft_caps.dm +++ b/code/modules/clothing/head/soft_caps.dm @@ -137,6 +137,13 @@ dog_fashion = null /obj/item/clothing/head/soft/cybersun + name = "cybersun agent cap" + desc = "A black baseball hat emblazoned with a reflective Cybersun patch." + icon_state = "agentsoft" + soft_type = "black" + dog_fashion = null + +/obj/item/clothing/head/soft/cybersun/medical name = "cybersun medic cap" desc = "A turquoise baseball hat emblazoned with a reflective cross. Typical of Cybersun Industries field medics." icon_state = "cybersunsoft" diff --git a/code/modules/clothing/outfits/syndicate.dm b/code/modules/clothing/outfits/syndicate.dm index 1c6c257ae71c..cb8f093a99e4 100644 --- a/code/modules/clothing/outfits/syndicate.dm +++ b/code/modules/clothing/outfits/syndicate.dm @@ -67,10 +67,10 @@ /datum/outfit/job/syndicate/assistant/cybersun name = "Junior Agent (Cybersun)" - uniform = /obj/item/clothing/under/syndicate + uniform = /obj/item/clothing/under/syndicate/cybersun shoes = /obj/item/clothing/shoes/jackboots r_pocket = /obj/item/radio - head = /obj/item/clothing/head/soft/black + head = /obj/item/clothing/head/soft/cybersun /datum/outfit/job/syndicate/assistant/twink name = "Deck Assistant (Twinkleshine)" @@ -261,10 +261,10 @@ /datum/outfit/job/syndicate/captain/cybersun name = "Captain (Cybersun)" - uniform = /obj/item/clothing/under/suit/black_really - head = /obj/item/clothing/head/HoS/syndicate + uniform = /obj/item/clothing/under/syndicate/cybersun/officer + suit = /obj/item/clothing/suit/armor/vest/capcarapace/cybersun + head = /obj/item/clothing/head/HoS/cybersun gloves = /obj/item/clothing/gloves/combat - suit = /obj/item/clothing/suit/armor/vest/capcarapace/syndicate //cargo tech @@ -405,9 +405,10 @@ name = "Intelligence Officer (Cybersun)" ears = /obj/item/radio/headset/syndicate/alt - uniform = /obj/item/clothing/under/suit/charcoal + uniform = /obj/item/clothing/under/syndicate/cybersun/officer + suit = /obj/item/clothing/suit/cybersun_suit shoes = /obj/item/clothing/shoes/jackboots - head = /obj/item/clothing/head/HoS/syndicate + head = /obj/item/clothing/head/HoS/cybersun gloves = /obj/item/clothing/gloves/combat id = /obj/item/card/id/syndicate_command/crew_id r_pocket = /obj/item/kitchen/knife/combat/survival @@ -488,7 +489,7 @@ /datum/outfit/job/syndicate/doctor/cybersun name = "Medical Doctor (Cybersun)" - uniform = /obj/item/clothing/under/syndicate/cybersun + uniform = /obj/item/clothing/under/syndicate/medic accessory = /obj/item/clothing/accessory/armband/medblue shoes = /obj/item/clothing/shoes/jackboots @@ -518,7 +519,7 @@ head = /obj/item/clothing/head/soft/paramedic suit = /obj/item/clothing/suit/toggle/labcoat/paramedic alt_suit = /obj/item/clothing/suit/apron/surgical - gloves = /obj/item/clothing/gloves/color/latex/nitrile + gloves = /obj/item/clothing/gloves/color/latex/nitrile/evil belt = /obj/item/storage/belt/medical/paramedic id = /obj/item/card/id l_pocket = /obj/item/pda/medical @@ -533,7 +534,7 @@ name = "Field Medic (Cybersun Industries)" uniform = /obj/item/clothing/under/syndicate/medic - head = /obj/item/clothing/head/soft/cybersun + head = /obj/item/clothing/head/soft/cybersun/medical shoes = /obj/item/clothing/shoes/combat suit = /obj/item/clothing/suit/toggle/labcoat/raincoat @@ -541,7 +542,7 @@ name = "Medic (Twinkleshine)" gloves = /obj/item/clothing/gloves/color/latex/nitrile/evil - alt_uniform = /obj/item/clothing/under/syndicate/cybersun + uniform = /obj/item/clothing/under/syndicate/medic glasses = /obj/item/clothing/glasses/hud/health belt = /obj/item/storage/belt/medical back = /obj/item/storage/backpack/duffelbag/syndie/med @@ -734,9 +735,9 @@ id = /obj/item/card/id/syndicate_command/crew_id ears = /obj/item/radio/headset - uniform = /obj/item/clothing/under/syndicate + uniform = /obj/item/clothing/under/syndicate/cybersun accessory = /obj/item/clothing/accessory/armband/cargo - head = /obj/item/clothing/head/soft/black + head = /obj/item/clothing/head/soft/cybersun r_pocket = /obj/item/radio /datum/outfit/job/syndicate/miner/gec @@ -818,8 +819,8 @@ /datum/outfit/job/syndicate/engineer/cybersun name = "Engineer (Cybersun)" - uniform = /obj/item/clothing/under/syndicate/cybersun + uniform = /obj/item/clothing/under/syndicate/cybersun/research shoes = /obj/item/clothing/shoes/workboots r_pocket = /obj/item/radio - head = /obj/item/clothing/head/beanie/black + head = /obj/item/clothing/head/soft/cybersun accessory = /obj/item/clothing/accessory/armband/engine diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index efeec4343c9c..d0eba4833ea5 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -56,6 +56,11 @@ name = "large tactical armor vest" icon_state = "marine_heavy" +/obj/item/clothing/suit/armor/vest/marine/trauma + name = "cybersun trauma team armor vest" + icon_state = "traumavest" + desc = "A set of stamped plasteel armor plates decorated with a medical cross and colors associated with the medical division of Cybersun." + /obj/item/clothing/suit/armor/vest/old name = "degrading armor vest" desc = "Older generation Type 1 armored vest. Due to degradation over time the vest is far less maneuverable to move in." @@ -143,6 +148,11 @@ desc = "A sinister looking vest of advanced armor worn over a black and red fireproof jacket. The gold collar and shoulders denote that this belongs to a high ranking syndicate officer." icon_state = "carapace_syndie" +/obj/item/clothing/suit/armor/vest/capcarapace/cybersun + name = "cybersun captain's haori" + desc = "An extraordinarily fashionable haori, utilized by cybersun captains. Weaved with armored fabric to protect the user from gunshots." + icon_state = "cybersunhaori" + /obj/item/clothing/suit/armor/vest/capcarapace/alt name = "captain's parade jacket" desc = "For when an armoured vest isn't fashionable enough." diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 466e75b012f7..5bb6923dec73 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -343,6 +343,12 @@ * Misc */ +/obj/item/clothing/suit/cybersun_suit + name = "cybersun suit" + desc = "A plain white suit commonly used by Cybersun's officers." + icon_state = "cybersun_suit" + item_state = "cybersun_suit" + /obj/item/clothing/suit/straight_jacket name = "straight jacket" desc = "A suit that completely restrains the wearer. Manufactured by Antyphun Corp." //Straight jacket is antifun diff --git a/code/modules/clothing/under/syndicate.dm b/code/modules/clothing/under/syndicate.dm index 30b47b4c3287..e2e972ab70ae 100644 --- a/code/modules/clothing/under/syndicate.dm +++ b/code/modules/clothing/under/syndicate.dm @@ -115,6 +115,12 @@ supports_variations = DIGITIGRADE_VARIATION | KEPORI_VARIATION /obj/item/clothing/under/syndicate/cybersun + name = "cybersun jumpsuit" + desc = "The standard jumpsuit used by the agents employed by Cybersun, in its distinctive half-black-half-white aesthetic." + icon_state = "cybersun_agent" + alt_covers_chest = TRUE + +/obj/item/clothing/under/syndicate/cybersun/research name = "Cybersun coveralls" desc = "Nomex coveralls worn by workers and research personnel employed by Cybersun industries." icon_state = "cybersun" @@ -122,12 +128,20 @@ alt_covers_chest = TRUE supports_variations = DIGITIGRADE_VARIATION | KEPORI_VARIATION +/obj/item/clothing/under/syndicate/cybersun/officer + name = "cybersun officer's suit" + desc = "A crimson-red suit used by the officers employed by Cybersun." + icon_state = "cybersun_officer" + alt_covers_chest = TRUE + supports_variations = DIGITIGRADE_VARIATION + /obj/item/clothing/under/syndicate/medic name = "Cybersun medical jumpsuit" desc = "Sterile coveralls worn by Cybersun Industries field medics for protection against biological hazards." icon_state = "cybersun_med" permeability_coefficient = 0.5 armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0) + supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON | VOX_VARIATION | KEPORI_VARIATION /obj/item/clothing/under/syndicate/medic/skirt name = "Cybersun medical jumpskirt" diff --git a/code/modules/overmap/missions/research_mission.dm b/code/modules/overmap/missions/research_mission.dm index 502824fae886..0e4996f7719d 100644 --- a/code/modules/overmap/missions/research_mission.dm +++ b/code/modules/overmap/missions/research_mission.dm @@ -129,7 +129,7 @@ use_power = NO_POWER_USE power_change() // calls update_appearance(), makes sure we're powered -/obj/machinery/mission_scanner/update_icon_state() +/obj/machinery/mission_scanner/update_appearance(updates) . = ..() if(is_operational) icon_state = "scanner_power" diff --git a/code/modules/overmap/ships/controlled_ship_datum.dm b/code/modules/overmap/ships/controlled_ship_datum.dm index 1118fb72f6f8..4397919593aa 100644 --- a/code/modules/overmap/ships/controlled_ship_datum.dm +++ b/code/modules/overmap/ships/controlled_ship_datum.dm @@ -77,9 +77,9 @@ shuttle_area.rename_area("[new_name] [initial(shuttle_area.name)]") if(!force) COOLDOWN_START(src, rename_cooldown, 5 MINUTES) - if(shuttle_port.virtual_z() == null) + if(shuttle_port?.virtual_z() == null) return TRUE - priority_announce("The [oldname] has been renamed to the [new_name].", "Docking Announcement", sender_override = new_name, zlevel = shuttle_port.virtual_z()) + priority_announce("The [oldname] has been renamed to the [new_name].", "Docking Announcement", sender_override = new_name, zlevel = shuttle_port?.virtual_z()) return TRUE /** diff --git a/html/changelogs/AutoChangeLog-pr-2166.yml b/html/changelogs/AutoChangeLog-pr-2166.yml deleted file mode 100644 index 1dd52d62dc03..000000000000 --- a/html/changelogs/AutoChangeLog-pr-2166.yml +++ /dev/null @@ -1,10 +0,0 @@ -author: FalloutFalcon -changes: - - {rscadd: '3 new Trickwines! Prism, Hearth, and Force'} - - {tweak: tweaked the old Trickwines to be slightly more balanced} - - {rscadd: srm tree and Trickwine distiller} - - {tweak: copy big mortar code to small mortar so you can chose between grinding - and juicing} - - {refactor: splits smoke flags for more control over chemical reactions} - - {server: Blackbox now records more info about chems} -delete-after: true diff --git a/html/changelogs/AutoChangeLog-pr-2465.yml b/html/changelogs/AutoChangeLog-pr-2465.yml deleted file mode 100644 index 52c1f52306f0..000000000000 --- a/html/changelogs/AutoChangeLog-pr-2465.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: Bjarl -changes: - - {rscadd: Static Anomalies are now even WORSE. Not balance wise. Roleplay wise.} -delete-after: true diff --git a/html/changelogs/AutoChangeLog-pr-2470.yml b/html/changelogs/AutoChangeLog-pr-2470.yml deleted file mode 100644 index 62687dbb16fb..000000000000 --- a/html/changelogs/AutoChangeLog-pr-2470.yml +++ /dev/null @@ -1,7 +0,0 @@ -author: thgvr -changes: - - {rscadd: 'Saunas, craftable with wooden planks. Uses wood for fuel, and requires - water splashed on the sauna.'} - - {rscadd: 'Towels. You can use them in-hand to change it from waist, chest, or - head.'} -delete-after: true diff --git a/html/changelogs/AutoChangeLog-pr-2473.yml b/html/changelogs/AutoChangeLog-pr-2473.yml deleted file mode 100644 index 11adbf4d71e5..000000000000 --- a/html/changelogs/AutoChangeLog-pr-2473.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: thgvr -changes: - - {rscadd: Gas overlays should now look normal on turfs with a color var set.} -delete-after: true diff --git a/html/changelogs/AutoChangeLog-pr-2475.yml b/html/changelogs/AutoChangeLog-pr-2475.yml deleted file mode 100644 index fff6c26b4c84..000000000000 --- a/html/changelogs/AutoChangeLog-pr-2475.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: thgvr -changes: - - {bugfix: PGF items now have real names and descriptions.} -delete-after: true diff --git a/html/changelogs/AutoChangeLog-pr-2476.yml b/html/changelogs/AutoChangeLog-pr-2476.yml deleted file mode 100644 index cfac420e028a..000000000000 --- a/html/changelogs/AutoChangeLog-pr-2476.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: GenericDM -changes: - - {tweak: you will now be warned before succumbing when talking in hardcrit} -delete-after: true diff --git a/html/changelogs/AutoChangeLog-pr-2478.yml b/html/changelogs/AutoChangeLog-pr-2478.yml deleted file mode 100644 index 3614f240749f..000000000000 --- a/html/changelogs/AutoChangeLog-pr-2478.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: Bjarl -changes: - - {rscadd: Syndicate groups have reported new models of turrets being attached to - their ships.} -delete-after: true diff --git a/html/changelogs/AutoChangeLog-pr-2479.yml b/html/changelogs/AutoChangeLog-pr-2479.yml new file mode 100644 index 000000000000..1b789c547820 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-2479.yml @@ -0,0 +1,4 @@ +author: Bjarl +changes: + - {bugfix: The polymodial sensor array now properly changes icon_state.} +delete-after: true diff --git a/html/changelogs/AutoChangeLog-pr-2484.yml b/html/changelogs/AutoChangeLog-pr-2484.yml new file mode 100644 index 000000000000..8cc4bdaf98b8 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-2484.yml @@ -0,0 +1,6 @@ +author: PositiveEntropy +changes: + - {bugfix: Cybersun outfits have been adjusted to be less syndicate-generalist and + more Cybersun.} + - {imageadd: 'Cybersun has received a full visual overhaul, as well as new goodies!'} +delete-after: true diff --git a/html/changelogs/archive/2023-11.yml b/html/changelogs/archive/2023-11.yml index 628db768b872..b87f79bb16aa 100644 --- a/html/changelogs/archive/2023-11.yml +++ b/html/changelogs/archive/2023-11.yml @@ -51,3 +51,24 @@ - code_imp: syndicate outfits have been repathed. Please report anything weird. retlaw34: - rscadd: Adds a lot of new pAI faces! pAIs rejoice! +2023-11-15: + Bjarl: + - rscadd: Syndicate groups have reported new models of turrets being attached to + their ships. + - rscadd: Static Anomalies are now even WORSE. Not balance wise. Roleplay wise. + FalloutFalcon: + - rscadd: 3 new Trickwines! Prism, Hearth, and Force + - tweak: tweaked the old Trickwines to be slightly more balanced + - rscadd: srm tree and Trickwine distiller + - tweak: copy big mortar code to small mortar so you can chose between grinding + and juicing + - refactor: splits smoke flags for more control over chemical reactions + - server: Blackbox now records more info about chems + GenericDM: + - tweak: you will now be warned before succumbing when talking in hardcrit + thgvr: + - rscadd: Gas overlays should now look normal on turfs with a color var set. + - rscadd: Saunas, craftable with wooden planks. Uses wood for fuel, and requires + water splashed on the sauna. + - rscadd: Towels. You can use them in-hand to change it from waist, chest, or head. + - bugfix: PGF items now have real names and descriptions. diff --git a/icons/mob/clothing/hands.dmi b/icons/mob/clothing/hands.dmi index 05e908af6794..0afcd0ad26c5 100644 Binary files a/icons/mob/clothing/hands.dmi and b/icons/mob/clothing/hands.dmi differ diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi index d3518a906b51..430ddef0699e 100644 Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ diff --git a/icons/mob/clothing/suit.dmi b/icons/mob/clothing/suit.dmi index f280cc9b1d0c..9ce60cc531ee 100644 Binary files a/icons/mob/clothing/suit.dmi and b/icons/mob/clothing/suit.dmi differ diff --git a/icons/mob/clothing/suits/armor.dmi b/icons/mob/clothing/suits/armor.dmi index fb11a1b7e62a..bc8daf14abd6 100644 Binary files a/icons/mob/clothing/suits/armor.dmi and b/icons/mob/clothing/suits/armor.dmi differ diff --git a/icons/mob/clothing/suits/spacesuits.dmi b/icons/mob/clothing/suits/spacesuits.dmi index 6e97b33cd1b7..8f6e380f3a3b 100644 Binary files a/icons/mob/clothing/suits/spacesuits.dmi and b/icons/mob/clothing/suits/spacesuits.dmi differ diff --git a/icons/mob/clothing/under/syndicate.dmi b/icons/mob/clothing/under/syndicate.dmi index 3eb82401831c..27c030aa4b43 100644 Binary files a/icons/mob/clothing/under/syndicate.dmi and b/icons/mob/clothing/under/syndicate.dmi differ diff --git a/icons/mob/species/kepori/onmob_uniform_kepori.dmi b/icons/mob/species/kepori/onmob_uniform_kepori.dmi index 1e0416588ae3..6f28d759ba5f 100644 Binary files a/icons/mob/species/kepori/onmob_uniform_kepori.dmi and b/icons/mob/species/kepori/onmob_uniform_kepori.dmi differ diff --git a/icons/mob/species/misc/digitigrade.dmi b/icons/mob/species/misc/digitigrade.dmi index 6af4794ee213..104387630acb 100644 Binary files a/icons/mob/species/misc/digitigrade.dmi and b/icons/mob/species/misc/digitigrade.dmi differ diff --git a/icons/obj/clothing/gloves.dmi b/icons/obj/clothing/gloves.dmi index b072c3645916..ff36ce0bce5e 100644 Binary files a/icons/obj/clothing/gloves.dmi and b/icons/obj/clothing/gloves.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index bdd5a47ed9c7..642e21ea3e09 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index 45153e384f5d..c464ebddf84e 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/icons/obj/clothing/suits/armor.dmi b/icons/obj/clothing/suits/armor.dmi index b13487adcf99..758c4836aeb0 100644 Binary files a/icons/obj/clothing/suits/armor.dmi and b/icons/obj/clothing/suits/armor.dmi differ diff --git a/icons/obj/clothing/suits/spacesuits.dmi b/icons/obj/clothing/suits/spacesuits.dmi index 7ab05863bf05..d467eac36a5a 100644 Binary files a/icons/obj/clothing/suits/spacesuits.dmi and b/icons/obj/clothing/suits/spacesuits.dmi differ diff --git a/icons/obj/clothing/under/syndicate.dmi b/icons/obj/clothing/under/syndicate.dmi index 9b1630feb16b..9ae89d62123f 100644 Binary files a/icons/obj/clothing/under/syndicate.dmi and b/icons/obj/clothing/under/syndicate.dmi differ