Skip to content

Commit

Permalink
shelllguard uniform&fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
MrCastmer committed Aug 25, 2024
1 parent 9b25df0 commit 4dbea93
Show file tree
Hide file tree
Showing 15 changed files with 109 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -152,11 +152,13 @@
new /obj/item/clothing/shoes/sneakers/black(src)
new /obj/item/clothing/head/bomb_hood(src)

/* Dripstation edit
/obj/structure/closet/bombcloset/security/PopulateContents()
new /obj/item/clothing/suit/bomb_suit/security(src)
new /obj/item/clothing/under/rank/security(src)
new /obj/item/clothing/shoes/jackboots(src)
new /obj/item/clothing/head/bomb_hood/security(src)
*/

/obj/structure/closet/bombcloset/white/PopulateContents()
new /obj/item/clothing/suit/bomb_suit/white(src)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -700,6 +700,12 @@ GLOBAL_LIST_INIT(closet_cutting_types, typecacheof(list(
new /obj/item/stamp(src)
new /obj/item/stamp/denied(src)

/obj/structure/closet/bombcloset/security/PopulateContents()
new /obj/item/clothing/suit/bomb_suit/security(src)
new /obj/item/clothing/under/rank/security/officer(src)
new /obj/item/clothing/shoes/jackboots(src)
new /obj/item/clothing/head/bomb_hood/security(src)

/obj/structure/closet/l3closet/PopulateContents()
new /obj/item/storage/bag/bio(src)
new /obj/item/clothing/suit/bio_suit/general(src)
Expand Down
5 changes: 0 additions & 5 deletions modular_dripstation/code/modules/clothing/belt.dm
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,6 @@
/obj/item/storage/belt/security/chief/Initialize(mapload)
. = ..()
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
STR.max_items = 6
STR.max_combined_w_class = 18
STR.max_w_class = WEIGHT_CLASS_NORMAL
STR.set_holdable(list(
/obj/item/melee/baton,
Expand All @@ -61,8 +59,6 @@
/obj/item/storage/box/beanbag,
/obj/item/reagent_containers/food/snacks/donut,
/obj/item/kitchen/knife/combat,
/obj/item/flashlight/seclite,
/obj/item/melee/classic_baton/telescopic,
/obj/item/radio,
/obj/item/pinpointer/tracker,
/obj/item/clothing/gloves,
Expand All @@ -71,7 +67,6 @@
/obj/item/holosign_creator/security,
/obj/item/shield/riot/tele,
/obj/item/barrier_taperoll/police,
/obj/item/multitool/tricorder,
/obj/item/crowbar,
/obj/item/screwdriver,
/obj/item/weldingtool,
Expand Down
50 changes: 50 additions & 0 deletions modular_dripstation/code/modules/clothing/department/corporate.dm
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,56 @@
icon_state = "shelg_sallet_visor"
tint = 5

/obj/item/clothing/under/shellguard
name = "shellguard employee uniform"
desc = "Standart uniform issued for ShellGuard employees. Red pants protects wearer from blood strains."
armor = list(MELEE = 10, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, FIRE = 20, ACID = 30, WOUND = 0, ELECTRIC = 0)
icon_state = "clerk_shelg"
icon = 'modular_dripstation/icons/obj/clothing/uniform/corporate/pmc.dmi'
worn_icon = 'modular_dripstation/icons/mob/clothing/uniform/corporate/pmc.dmi'

/obj/item/clothing/under/shellguard/guard
name = "shellguard guard uniform"
desc = "Standart uniform issued for ShellGuard guard. Red color protects wearer from blood strains."
icon_state = "guard_shelg"

/obj/item/clothing/under/shellguard/feldsher
name = "shellguard feldsher uniform"
desc = "Standart uniform issued for ShellGuard feldsher. The one`s clothing whos job is to patch wounds."
icon_state = "guard_shelg"

/obj/item/clothing/under/shellguard/pilot
name = "shellguard pilot uniform"
desc = "Standart uniform issued for ShellGuard pilot. Red color protects wearer from blood strains."
icon_state = "pilot_shelg"

/obj/item/clothing/under/shellguard/gorka
name = "shellguard gorka"
desc = "Gorka issued for ShellGuard personel. Red color protects wearer from blood strains."
icon_state = "shelg_gorka"

/obj/item/clothing/under/shellguard/warden
name = "shellguard warden uniform"
desc = "Standart uniform issued for ShellGuard warden. Red color protects wearer from blood strains."
icon_state = "warden_shelg"

/obj/item/clothing/under/shellguard/gorka/warden
name = "shellguard warden`s gorka"
desc = "Gorka issued for ShellGuard wardens. Red color protects wearer from blood strains."
icon_state = "shelg_warden_gorka"

/obj/item/clothing/under/shellguard/tech
name = "shellguard tech uniform"
desc = "Standart uniform issued for ShellGuard tech specialist`s. Red color protects wearer from blood strains."
icon_state = "tech_shelg"

/obj/item/clothing/under/shellguard/combat
name = "shellguard combat turtleneck"
desc = "Combat turtle issued for ShellGuard assault persineel. Ready to operate."
icon_state = "shelg_combat"
cold_protection = CHEST|GROIN
min_cold_protection_temperature = ARMOR_MIN_TEMP_PROTECT

////Helldivers////
/obj/item/storage/belt/military/helldiver
name = "helldiver belt"
Expand Down
7 changes: 7 additions & 0 deletions modular_dripstation/code/modules/clothing/hats.dm
Original file line number Diff line number Diff line change
Expand Up @@ -83,11 +83,18 @@
icon = 'icons/obj/clothing/hats/hats.dmi'
worn_icon = 'icons/mob/clothing/head/head.dmi'

/obj/item/clothing/head/bomb_hood/security
icon_state = "blasthelmet_sec"
icon = 'modular_dripstation/icons/obj/clothing/hats.dmi'
worn_icon = 'modular_dripstation/icons/mob/clothing/hats.dmi'

obj/item/clothing/head/bio_hood
desc = "A hood that protects the head from biological contaminants."
icon_state = "hazmat"
icon = 'modular_dripstation/icons/obj/clothing/hats.dmi'
worn_icon = 'modular_dripstation/icons/mob/clothing/hats.dmi'
dynamic_hair_suffix = ""
clothing_flags = THICKMATERIAL | BLOCK_GAS_SMOKE_EFFECT

obj/item/clothing/head/bio_hood/general
icon_state = "hazmat_general"
Expand Down
31 changes: 31 additions & 0 deletions modular_dripstation/code/modules/clothing/mask.dm
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,34 @@
worn_icon = 'modular_dripstation/icons/mob/clothing/masks.dmi'
armor = list(MELEE = 5, BULLET = 5, LASER = 5, ENERGY = 5, BOMB = 0, BIO = 50, FIRE = 20, ACID = 10)
resistance_flags = FIRE_PROOF | ACID_PROOF

/obj/item/clothing/mask/gas/bio
name = "bio gas mask"
desc = "Standart biological gasmask. While not so good for concealing your identity, it is good for blocking gas flow."
icon_state = "gas_clear"
icon = 'modular_dripstation/icons/obj/clothing/masks.dmi'
worn_icon = 'modular_dripstation/icons/mob/clothing/masks.dmi'
w_class = WEIGHT_CLASS_SMALL
flags_inv = HIDEFACIALHAIR
armor = list(MELEE = 0, BULLET = 0, LASER = 0,ENERGY = 0, BOMB = 0, BIO = 100, RAD = 40, FIRE = 0, ACID = 100)
resistance_flags = ACID_PROOF

/obj/item/clothing/mask/gas/bio/sci
name = "scientiest`s bio gas mask"
desc = "Biological gasmask. Reinforced for working in hazard environment. While not so good for concealing your identity, it is good for blocking gas flow."
icon_state = "gas_sci"
armor = list(MELEE = 0, BULLET = 0, LASER = 0,ENERGY = 0, BOMB = 0, BIO = 100, RAD = 50, FIRE = 30, ACID = 100)
resistance_flags = FIRE_PROOF | ACID_PROOF

/obj/item/clothing/mask/gas/bio/sec
name = "security bio gas mask"
desc = "Standart tactical bio gasmask. While not so good for concealing your identity, it is good for blocking gas flow."
icon_state = "secbio_gasmask"

/obj/item/clothing/mask/gas/bio/sci/combat
desc = "Biological gasmask. Reinforced for working in hazard environment. While good for concealing your identity, it is also good for blocking gas flow."
icon_state = "heva"
dynamic_hair_suffix = ""
flags_inv = HIDEEARS|HIDEEYES|HIDEFACE|HIDEFACIALHAIR|HIDEHAIR
body_parts_covered = HEAD
armor = list(MELEE = 10, BULLET = 0, LASER = 0,ENERGY = 0, BOMB = 0, BIO = 100, RAD = 50, FIRE = 100, ACID = 100)
13 changes: 10 additions & 3 deletions modular_dripstation/code/modules/clothing/suit.dm
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@
worn_icon = 'modular_dripstation/icons/mob/clothing/suits.dmi'
icon_state = "hazmat_suit"
slowdown = 0.33
body_parts_covered = HEAD|CHEST|GROIN
flags_inv = HIDEJUMPSUIT|HIDEHAIR|HIDEEARS
dynamic_hair_suffix = ""
body_parts_covered = CHEST|GROIN
flags_inv = HIDEJUMPSUIT

/obj/item/clothing/suit/bio_suit/general
icon_state = "hazmat_suit_general"
Expand Down Expand Up @@ -35,6 +34,14 @@
icon = 'icons/obj/clothing/suits/suits.dmi'
worn_icon = 'icons/mob/clothing/suit/suit.dmi'

/obj/item/clothing/suit/bomb_suit/security
icon = 'modular_dripstation/icons/obj/clothing/suits.dmi'
worn_icon = 'modular_dripstation/icons/mob/clothing/suits.dmi'
icon_state = "blastsuit_sec"
body_parts_covered = CHEST|GROIN|ARMS|HANDS
heat_protection = CHEST|GROIN|ARMS|HANDS
cold_protection = CHEST|GROIN|ARMS|HANDS

/obj/item/clothing/suit/poncho
worn_icon = 'modular_dripstation/icons/mob/clothing/suits.dmi'
lefthand_file = 'modular_dripstation/icons/mob/inhands/clothing/suits_lefthand.dmi'
Expand Down
2 changes: 1 addition & 1 deletion modular_dripstation/code/modules/job/job_types/lawyer.dm
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
department_head = list("Magistrate")
supervisors = "the magistrate and the nanotrasen representative"
paycheck_department = ACCOUNT_CAR
department_for_prefs = /datum/job_department/central_command
department_for_prefs = /datum/job_department/security
departments_list = list(
/datum/job_department/security
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
projectile_type = /obj/projectile/bullet/a556/ssaap

/obj/item/ammo_casing/shotgun/syndie
name = "12g AP-СSS (Armor Piercing Ceramic Shotgun Slug)"
desc = "A high penetrative 12-gauge сeramic slug without manufacturer's marking."
name = "12g AP-CSS (Armor Piercing Ceramic Shotgun Slug)"
desc = "A high penetrative 12-gauge ceramic slug without manufacturer's marking."

/obj/item/ammo_casing/shotgun/buckshot/syndie
name = "12/70 RIP-S shell (Syndicate Radically Invasive Projectile)"
Expand Down
Binary file modified modular_dripstation/icons/mob/clothing/hats.dmi
Binary file not shown.
Binary file modified modular_dripstation/icons/mob/clothing/masks.dmi
Binary file not shown.
Binary file modified modular_dripstation/icons/mob/clothing/suits.dmi
Binary file not shown.
Binary file modified modular_dripstation/icons/obj/clothing/hats.dmi
Binary file not shown.
Binary file modified modular_dripstation/icons/obj/clothing/masks.dmi
Binary file not shown.
Binary file modified modular_dripstation/icons/obj/clothing/suits.dmi
Binary file not shown.

0 comments on commit 4dbea93

Please sign in to comment.