Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tweak: edit armor for gloves and boots from armory #6254

Open
wants to merge 7 commits into
base: master220
Choose a base branch
from
Open

tweak: edit armor for gloves and boots from armory #6254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
dd1d48b
Статы
FlitchTime Dec 15, 2024
7370d31
Статы ботинок и перчей, новые риот боты и перчи, перестановка оружейк…
FlitchTime Dec 15, 2024
f32377d
Ещё немного перестановок в оружейке
FlitchTime Dec 16, 2024
9ab2919
Ещё немного
FlitchTime Dec 16, 2024
134cfdc
rrrrrr
FlitchTime Dec 16, 2024
8be71c9
Фалсе
FlitchTime Dec 18, 2024
4dd0d32
Декали, сортировка, пиксельшифт, карго, сумки
FlitchTime Dec 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
489 changes: 243 additions & 246 deletions _maps/map_files/Delta/delta.dmm
View file
Open in desktop

Large diffs are not rendered by default.

889 changes: 432 additions & 457 deletions _maps/map_files/celestation/celestation.dmm
View file
Open in desktop

Large diffs are not rendered by default.

767 changes: 408 additions & 359 deletions _maps/map_files/cerestation/cerestation.dmm
View file
Open in desktop

Large diffs are not rendered by default.

856 changes: 455 additions & 401 deletions _maps/map_files/cyberiad/cyberiad.dmm
View file
Open in desktop

Large diffs are not rendered by default.

3,213 changes: 1,554 additions & 1,659 deletions _maps/map_files/nova/nova.dmm
View file
Open in desktop

Large diffs are not rendered by default.

20 changes: 7 additions & 13 deletions code/datums/supplypacks.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,26 +497,20 @@ GLOBAL_LIST_INIT(all_supply_groups, list(SUPPLY_EMERGENCY,SUPPLY_SECURITY,SUPPLY

/datum/supply_packs/security/armory/riothelmets
name = "Riot Bundle Crate"
contains = list(/obj/item/clothing/head/helmet/riot,
/obj/item/clothing/head/helmet/riot,
/obj/item/clothing/head/helmet/riot,
contains = list(/obj/item/storage/backpack/duffel/security/riot_armory,
/obj/item/storage/backpack/duffel/security/riot_armory,
/obj/item/storage/backpack/duffel/security/riot_armory,
/obj/item/shield/riot,
/obj/item/shield/riot,
/obj/item/shield/riot,
/obj/item/clothing/suit/armor/riot,
/obj/item/clothing/suit/armor/riot,
/obj/item/clothing/suit/armor/riot)
/obj/item/shield/riot)
cost = 80
containername = "riot bundle crate"

/datum/supply_packs/security/armory/bulletarmor
name = "Bulletproof Armor Crate"
contains = list(/obj/item/clothing/suit/armor/bulletproof,
/obj/item/clothing/suit/armor/bulletproof,
/obj/item/clothing/suit/armor/bulletproof,
/obj/item/clothing/head/helmet/alt,
/obj/item/clothing/head/helmet/alt,
/obj/item/clothing/head/helmet/alt)
contains = list(/obj/item/storage/backpack/duffel/security/bulletproof_armory,
/obj/item/storage/backpack/duffel/security/bulletproof_armory,
/obj/item/storage/backpack/duffel/security/bulletproof_armory)
cost = 40
containername = "tactical armor crate"

Expand Down
22 changes: 20 additions & 2 deletions code/game/objects/items/weapons/storage/backpack.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -750,8 +750,8 @@
/obj/item/storage/backpack/duffel/security/riot/populate_contents()
new /obj/item/clothing/head/helmet/riot (src)
new /obj/item/clothing/suit/armor/riot (src)
new /obj/item/clothing/gloves/combat (src)
new /obj/item/clothing/shoes/combat/swat (src)
new /obj/item/clothing/gloves/combat/riot (src)
new /obj/item/clothing/shoes/combat/riot (src)
new /obj/item/melee/baton (src)
new /obj/item/shield/riot/tele (src)
new /obj/item/gun/energy/gun/pdw9 (src)
Expand All @@ -760,6 +760,24 @@
new /obj/item/storage/box/zipties (src)
new /obj/item/storage/box/bola (src)

/obj/item/storage/backpack/duffel/security/riot_armory
name = "Riot Armor Kit"

/obj/item/storage/backpack/duffel/security/riot_armory/populate_contents()
new /obj/item/clothing/head/helmet/riot (src)
new /obj/item/clothing/suit/armor/riot (src)
new /obj/item/clothing/gloves/combat/riot (src)
new /obj/item/clothing/shoes/combat/riot (src)

/obj/item/storage/backpack/duffel/security/bulletproof_armory
name = "Bulletproof Armor Kit"

/obj/item/storage/backpack/duffel/security/bulletproof_armory/populate_contents()
new /obj/item/clothing/head/helmet/alt (src)
new /obj/item/clothing/suit/armor/bulletproof (src)
new /obj/item/clothing/gloves/color/black/ballistic (src)
new /obj/item/clothing/shoes/jackboots/armored (src)

/obj/item/storage/backpack/duffel/security/war
name = "Wartime Emergency Kit"

Expand Down
2 changes: 1 addition & 1 deletion code/modules/clothing/gloves/color.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@
desc = "Pair of gloves with some protection"
icon_state = "armored_gloves"
item_state = "armored_gloves"
armor = list("melee" = 5, "bullet" = 5, "laser" = 5, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
armor = list("melee" = 5, "bullet" = 25, "laser" = 10, "energy" = 5, "bomb" = 5, "bio" = 0, "rad" = 0, "fire" = 75, "acid" = 75)
can_be_cut = FALSE
sprite_sheets = list(
SPECIES_VOX = 'icons/mob/clothing/species/vox/gloves.dmi',
Expand Down
19 changes: 17 additions & 2 deletions code/modules/clothing/gloves/miscellaneous.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
transfer_prints = FALSE

/obj/item/clothing/gloves/combat
desc = "These tactical gloves are both insulated and offer protection from heat sources."
name = "combat gloves"
desc = "These tactical gloves are both insulated and offer melee protection."
icon_state = "combat"
item_state = "swat_gl"
siemens_coefficient = 0
Expand All @@ -47,7 +47,22 @@
heat_protection = HANDS
max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT
resistance_flags = NONE
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 50)
armor = list("melee" = 25, "bullet" = 5, "laser" = 5, "energy" = 10, "bomb" = 10, "bio" = 0, "rad" = 0, "fire" = 70, "acid" = 70)

/obj/item/clothing/gloves/combat/riot
name = "riot gloves"
desc = "These riot gloves are both insulated and offer melee protection."
icon_state = "riotgloves"
item_state = "riotgloves"
sprite_sheets = list(
SPECIES_VOX = 'icons/mob/clothing/species/vox/gloves.dmi',
SPECIES_DRASK = 'icons/mob/clothing/species/drask/gloves.dmi',
SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/gloves.dmi',
SPECIES_FARWA = 'icons/mob/clothing/species/monkey/gloves.dmi',
SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/gloves.dmi',
SPECIES_NEARA = 'icons/mob/clothing/species/monkey/gloves.dmi',
SPECIES_STOK = 'icons/mob/clothing/species/monkey/gloves.dmi'
)

/obj/item/clothing/gloves/bracer
name = "bone bracers"
Expand Down
22 changes: 21 additions & 1 deletion code/modules/clothing/shoes/miscellaneous.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,26 @@
pickup_sound = 'sound/items/handling/boots_pickup.ogg'
drop_sound = 'sound/items/handling/boots_drop.ogg'

/obj/item/clothing/shoes/combat/riot
name = "riot boots"
desc = "High speed, low drag riot boots."
can_cut_open = FALSE
icon_state = "riotboots"
item_state = "riotboots"
sprite_sheets = list(
SPECIES_VOX = 'icons/mob/clothing/species/vox/shoes.dmi',
SPECIES_DRASK = 'icons/mob/clothing/species/drask/shoes.dmi',
SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/shoes.dmi',
SPECIES_FARWA = 'icons/mob/clothing/species/monkey/shoes.dmi',
SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/shoes.dmi',
SPECIES_NEARA = 'icons/mob/clothing/species/monkey/shoes.dmi',
SPECIES_STOK = 'icons/mob/clothing/species/monkey/shoes.dmi',
SPECIES_UNATHI = 'icons/mob/clothing/species/unathi/shoes.dmi',
SPECIES_ASHWALKER_BASIC = 'icons/mob/clothing/species/unathi/shoes.dmi',
SPECIES_ASHWALKER_SHAMAN = 'icons/mob/clothing/species/unathi/shoes.dmi',
SPECIES_DRACONOID = 'icons/mob/clothing/species/unathi/shoes.dmi'
)

/obj/item/clothing/shoes/combat/swat //overpowered boots for death squads
name = "\improper SWAT shoes"
desc = "High speed, no drag combat boots."
Expand Down Expand Up @@ -155,7 +175,7 @@
icon_state = "armored_shoes"
item_color = "armored_shoes"
item_state = "armored_shoes"
armor = list("melee" = 5, "bullet" = 5, "laser" = 5, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
armor = list("melee" = 5, "bullet" = 25, "laser" = 10, "energy" = 5, "bomb" = 5, "bio" = 0, "rad" = 0, "fire" = 75, "acid" = 75)
sprite_sheets = list(
SPECIES_VOX = 'icons/mob/clothing/species/vox/shoes.dmi',
SPECIES_DRASK = 'icons/mob/clothing/species/drask/shoes.dmi',
Expand Down
Binary file modified icons/mob/clothing/feet.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/mob/clothing/hands.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/mob/clothing/species/drask/gloves.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/mob/clothing/species/drask/shoes.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/mob/clothing/species/monkey/gloves.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/mob/clothing/species/monkey/shoes.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/mob/clothing/species/unathi/shoes.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/mob/clothing/species/vox/gloves.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/mob/clothing/species/vox/shoes.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/mob/inhands/clothing_lefthand.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/mob/inhands/clothing_righthand.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/obj/clothing/gloves.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/obj/clothing/shoes.dmi
View file
Open in desktop
Binary file not shown.
Loading