diff --git a/code/modules/clothing/suits/modular_armor.dm b/code/modules/clothing/suits/modular_armor.dm index fcf4d07c0f2..3da4df047b1 100644 --- a/code/modules/clothing/suits/modular_armor.dm +++ b/code/modules/clothing/suits/modular_armor.dm @@ -30,6 +30,12 @@ /obj/item/clothing/accessory/storage/modular_pouch ) +/obj/item/clothing/suit/armor/carrier/scc + starting_accessories = list( + /obj/item/clothing/accessory/armor_plate/scc, + /obj/item/clothing/accessory/storage/modular_pouch + ) + /obj/item/clothing/suit/armor/carrier/riot starting_accessories = list( /obj/item/clothing/accessory/armor_plate/riot, @@ -112,6 +118,12 @@ icon_state = "plate_generic" item_state = "plate_generic" +/obj/item/clothing/accessory/armor_plate/scc + name = "scc armor plate" + desc = "A light-weight kevlar armor plate in SCC corporate colors. Often issued to untrained personnel, to help with identification." + icon_state = "plate_blue" + item_state = "plate_scc" + /obj/item/clothing/accessory/armor_plate/hos name = "commander armor plate" desc = "A particularly light-weight armor plate with really cool gold bands. Even more stylish when the gold bands are covered in the blood of your goons!" @@ -243,6 +255,12 @@ icon_state = "helm_sec" item_state = "helm_sec" +/obj/item/clothing/head/helmet/security/scc + name = "scc helmet" + desc = "A helmet in SCC colors. Often issued to untrained personnel." + icon_state = "helm_scc" + item_state = "helm_scc" + /obj/item/clothing/head/helmet/security/generic name = "standard helmet" desc = "A shiny helmet in grey! Goes well with the respective plate carrier." diff --git a/code/modules/clothing/under/accessories/armor.dm b/code/modules/clothing/under/accessories/armor.dm index 6a0673aae22..d32b07cbd02 100644 --- a/code/modules/clothing/under/accessories/armor.dm +++ b/code/modules/clothing/under/accessories/armor.dm @@ -26,6 +26,11 @@ icon_state = "legguards_generic" item_state = "legguards_generic" +/obj/item/clothing/accessory/leg_guard/scc + name = "scc leg guards" + icon_state = "legguards_scc" + item_state = "legguards_scc" + /obj/item/clothing/accessory/leg_guard/ablative name = "ablative leg guards" desc = "These will protect your legs and feet from energy weapons." @@ -135,6 +140,11 @@ icon_state = "armguards_generic" item_state = "armguards_generic" +/obj/item/clothing/accessory/arm_guard/scc + name = "scc arm guards" + icon_state = "armguards_scc" + item_state = "armguards_scc" + /obj/item/clothing/accessory/arm_guard/ablative name = "ablative arm guards" desc = "These arm guards will protect your hands and arms from energy weapons." diff --git a/html/changelogs/dansemacabre_sccblau.yml b/html/changelogs/dansemacabre_sccblau.yml new file mode 100644 index 00000000000..cb95a643998 --- /dev/null +++ b/html/changelogs/dansemacabre_sccblau.yml @@ -0,0 +1,41 @@ +################################ +# 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 +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: TheDanseMacabre + +# 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, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Changed the crew armory armor from generic grey gear to SCC blue." diff --git a/icons/clothing/kit/modular_armor.dmi b/icons/clothing/kit/modular_armor.dmi index 89d341e6b16..3d25e2ba035 100644 Binary files a/icons/clothing/kit/modular_armor.dmi and b/icons/clothing/kit/modular_armor.dmi differ diff --git a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm index 4bba56367c0..2542fc930a2 100644 --- a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm +++ b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm @@ -12051,34 +12051,26 @@ /area/crew_quarters/captain) "jOB" = ( /obj/structure/table/rack, -/obj/item/clothing/accessory/armband/sec, -/obj/item/clothing/accessory/armband/sec, -/obj/item/clothing/accessory/armband/sec, -/obj/item/clothing/suit/armor/carrier/generic, -/obj/item/clothing/suit/armor/carrier/generic, -/obj/item/clothing/suit/armor/carrier/generic, -/obj/item/clothing/head/helmet/security/generic, -/obj/item/clothing/head/helmet/security/generic, -/obj/item/clothing/head/helmet/security/generic, -/obj/item/clothing/accessory/arm_guard/generic, -/obj/item/clothing/accessory/arm_guard/generic, -/obj/item/clothing/accessory/arm_guard/generic, -/obj/item/clothing/accessory/leg_guard/generic, -/obj/item/clothing/accessory/leg_guard/generic, -/obj/item/clothing/accessory/leg_guard/generic, +/obj/item/clothing/accessory/leg_guard/scc, +/obj/item/clothing/accessory/leg_guard/scc, +/obj/item/clothing/accessory/leg_guard/scc, +/obj/item/clothing/accessory/arm_guard/scc, +/obj/item/clothing/accessory/arm_guard/scc, +/obj/item/clothing/accessory/arm_guard/scc, +/obj/item/clothing/suit/armor/carrier/scc, +/obj/item/clothing/suit/armor/carrier/scc, +/obj/item/clothing/suit/armor/carrier/scc, +/obj/item/clothing/head/helmet/security/scc, +/obj/item/clothing/head/helmet/security/scc, +/obj/item/clothing/head/helmet/security/scc, +/obj/item/clothing/accessory/armband/scc, +/obj/item/clothing/accessory/armband/scc, +/obj/item/clothing/accessory/armband/scc, /obj/item/clothing/head/leader_headband, /obj/effect/floor_decal/corner/blue{ dir = 9 }, /obj/effect/floor_decal/industrial/outline/red, -/obj/machinery/camera/motion{ - c_tag = "Deck 3 - Crew Armoury Starboard"; - dir = 4; - network = list("Command","Security") - }, -/obj/machinery/light{ - dir = 8 - }, /turf/simulated/floor/tiled/dark, /area/horizon/crew_armoury) "jOC" = ( @@ -14878,26 +14870,26 @@ /area/crew_quarters/lounge) "lSZ" = ( /obj/structure/table/rack, -/obj/item/clothing/accessory/armband/sec, -/obj/item/clothing/accessory/armband/sec, -/obj/item/clothing/accessory/armband/sec, -/obj/item/clothing/suit/armor/carrier/generic, -/obj/item/clothing/suit/armor/carrier/generic, -/obj/item/clothing/suit/armor/carrier/generic, -/obj/item/clothing/head/helmet/security/generic, -/obj/item/clothing/head/helmet/security/generic, -/obj/item/clothing/head/helmet/security/generic, -/obj/item/clothing/accessory/arm_guard/generic, -/obj/item/clothing/accessory/arm_guard/generic, -/obj/item/clothing/accessory/arm_guard/generic, -/obj/item/clothing/accessory/leg_guard/generic, -/obj/item/clothing/accessory/leg_guard/generic, -/obj/item/clothing/accessory/leg_guard/generic, -/obj/item/clothing/head/leader_headband, /obj/effect/floor_decal/corner/red/full{ dir = 8 }, /obj/effect/floor_decal/industrial/outline/red, +/obj/item/clothing/accessory/leg_guard/scc, +/obj/item/clothing/accessory/leg_guard/scc, +/obj/item/clothing/accessory/leg_guard/scc, +/obj/item/clothing/accessory/arm_guard/scc, +/obj/item/clothing/accessory/arm_guard/scc, +/obj/item/clothing/accessory/arm_guard/scc, +/obj/item/clothing/suit/armor/carrier/scc, +/obj/item/clothing/suit/armor/carrier/scc, +/obj/item/clothing/suit/armor/carrier/scc, +/obj/item/clothing/head/helmet/security/scc, +/obj/item/clothing/head/helmet/security/scc, +/obj/item/clothing/head/helmet/security/scc, +/obj/item/clothing/accessory/armband/scc, +/obj/item/clothing/accessory/armband/scc, +/obj/item/clothing/accessory/armband/scc, +/obj/item/clothing/head/leader_headband, /turf/simulated/floor/tiled/dark, /area/horizon/crew_armoury) "lTQ" = (