Skip to content

Commit

Permalink
Minor fixes and tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
@SiuDuM
SiuDuM committed Jul 11, 2024
1 parent 173948a commit b15c36b
Show file tree
Hide file tree
Showing 3 changed files with 318 additions and 57 deletions.
19 changes: 19 additions & 0 deletions code/_globalvars/lists/maintenance_loot.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@ GLOBAL_LIST_INIT(common_loot, list( //common: basic items
/obj/item/weldingtool = 1,
/obj/item/wirecutters = 1,
/obj/item/wrench = 1,
/obj/item/gun/ballistic/automatic/pistol/no_mag = 1,
/obj/item/gun/ballistic/automatic/pistol/m1911/no_mag = 1,
) = 1,

list(//equipment
Expand Down Expand Up @@ -148,6 +150,7 @@ GLOBAL_LIST_INIT(common_loot, list( //common: basic items
/obj/item/stack/spacecash/c10 = 1,
/obj/item/stack/sticky_tape = 1,
/obj/item/tank/internals/emergency_oxygen = 1,
/obj/item/disk/data/hyper/preloaded/fabricator/civ = 1,

//light sources
/obj/effect/spawner/random/decoration/glowstick = 1,
Expand All @@ -171,6 +174,8 @@ GLOBAL_LIST_INIT(uncommon_loot, list(//uncommon: useful items
/obj/item/roller = 1,
/obj/item/spear = 1,
/obj/item/weldingtool/largetank = 1,
/obj/item/gun/ballistic/automatic/pistol = 1,
/obj/item/gun/ballistic/automatic/pistol/m1911 = 1,
) = 8,

list(//equipment
Expand Down Expand Up @@ -267,6 +272,12 @@ GLOBAL_LIST_INIT(uncommon_loot, list(//uncommon: useful items
/obj/item/clothing/shoes/jackboots = 1,
/obj/item/dice/d20 = 1, //To balance out the stealth die of fates in oddities
) = 1,
list(//data disks for lathes
/obj/item/disk/data/hyper/preloaded/fabricator/engineering = 1,
/obj/item/disk/data/hyper/preloaded/fabricator/medical = 1,
/obj/item/disk/data/hyper/preloaded/fabricator/supply = 1,
/obj/item/disk/data/hyper/preloaded/fabricator/service = 1,
) = 1,
))


Expand Down Expand Up @@ -313,6 +324,14 @@ GLOBAL_LIST_INIT(rarity_loot, list(//rare: really good items
/obj/item/disk/nuclear/fake = 1,
/obj/item/skillchip/brainwashing = 1,
/obj/item/tattoo_kit = 1,
/obj/effect/spawner/random/deadspace/rig = 1,
/obj/effect/spawner/random/deadspace/rig/scaf = 1,
) = 1,

list(//data disks for lathes
/obj/item/disk/data/hyper/preloaded/fabricator/omni = 1,
/obj/item/disk/data/hyper/preloaded/fabricator/security = 1,
/obj/item/disk/data/hyper/preloaded/fabricator/imprinter = 1,
) = 1,

))
Expand Down
26 changes: 13 additions & 13 deletions code/modules/clothing/suits/armor.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
equip_delay_other = 40
max_integrity = 250
resistance_flags = NONE
armor = list(BLUNT = 35, PUNCTURE = 10, SLASH = 50, LASER = 30, ENERGY = 40, BOMB = 25, BIO = 0, FIRE = 50, ACID = 50)
armor = list(BLUNT = 45, PUNCTURE = 10, SLASH = 60, LASER = 30, ENERGY = 40, BOMB = 25, BIO = 0, FIRE = 50, ACID = 50)

/obj/item/clothing/suit/armor/Initialize(mapload)
. = ..()
Expand All @@ -26,7 +26,7 @@
blood_overlay_type = "armor"
dog_fashion = /datum/dog_fashion/back
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON | CLOTHING_TESHARI_VARIATION | CLOTHING_VOX_VARIATION //need to do these
armor = list(BLUNT = 35, PUNCTURE = 20, SLASH = 35, LASER = 20, ENERGY = 30, BOMB = 25, BIO = 0, FIRE = 50, ACID = 50)
armor = list(BLUNT = 45, PUNCTURE = 20, SLASH = 45, LASER = 20, ENERGY = 30, BOMB = 25, BIO = 0, FIRE = 50, ACID = 50)

/obj/item/clothing/suit/armor/vest/sec
name = "martian armor vest"
Expand All @@ -39,7 +39,7 @@
desc = "A thick, flexible kevlar vest. Keeps your chest protected from stabbings and shootings, but it won't do much against blunt force."
icon_state = "armoralt"
inhand_icon_state = "armoralt"
armor = list(BLUNT = 15, PUNCTURE = 40, SLASH = 10, LASER = 30, ENERGY = 30, BOMB = 10, BIO = 0, FIRE = 50, ACID = 50)
armor = list(BLUNT = 25, PUNCTURE = 40, SLASH = 20, LASER = 30, ENERGY = 30, BOMB = 10, BIO = 0, FIRE = 50, ACID = 50)

/obj/item/clothing/suit/armor/vest/marine
name = "tactical armor vest"
Expand All @@ -55,7 +55,7 @@
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON | CLOTHING_VOX_VARIATION | CLOTHING_TESHARI_VARIATION


armor = list(BLUNT = 50, PUNCTURE = 20, SLASH = 70, LASER = 30, ENERGY = 25, BOMB = 50, BIO = 100, FIRE = 40, ACID = 50)
armor = list(BLUNT = 60, PUNCTURE = 20, SLASH = 80, LASER = 30, ENERGY = 25, BOMB = 50, BIO = 100, FIRE = 40, ACID = 50)

/obj/item/clothing/suit/armor/vest/marine/security
name = "large tactical armor vest"
Expand Down Expand Up @@ -97,7 +97,7 @@
icon_state = "hos"
inhand_icon_state = "greatcoat"
body_parts_covered = CHEST|GROIN|ARMS|LEGS
armor = list(BLUNT = 20, PUNCTURE = 0, SLASH = 30, LASER = 30, ENERGY = 40, BOMB = 25, BIO = 0, FIRE = 70, ACID = 90)
armor = list(BLUNT = 30, PUNCTURE = 0, SLASH = 40, LASER = 30, ENERGY = 40, BOMB = 25, BIO = 0, FIRE = 70, ACID = 90)
cold_protection = CHEST|GROIN|LEGS|ARMS
heat_protection = CHEST|GROIN|LEGS|ARMS
strip_delay = 80
Expand Down Expand Up @@ -156,7 +156,7 @@
icon_state = "capcarapace"
inhand_icon_state = "armor"
body_parts_covered = CHEST|GROIN
armor = list(BLUNT = 50, PUNCTURE = 20, SLASH = 70, LASER = 50, ENERGY = 50, BOMB = 25, BIO = 0, FIRE = 100, ACID = 90)
armor = list(BLUNT = 60, PUNCTURE = 20, SLASH = 80, LASER = 50, ENERGY = 50, BOMB = 25, BIO = 0, FIRE = 100, ACID = 90)
dog_fashion = null
resistance_flags = FIRE_PROOF
supports_variations_flags = NONE
Expand Down Expand Up @@ -187,7 +187,7 @@
body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
cold_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
armor = list(BLUNT = 50, PUNCTURE = 10, SLASH = 50, LASER = 10, ENERGY = 10, BOMB = 0, BIO = 0, FIRE = 80, ACID = 80)
armor = list(BLUNT = 60, PUNCTURE = 10, SLASH = 60, LASER = 10, ENERGY = 10, BOMB = 0, BIO = 0, FIRE = 80, ACID = 80)
clothing_flags = BLOCKS_SHOVE_KNOCKDOWN
strip_delay = 80
equip_delay_other = 60
Expand All @@ -199,7 +199,7 @@
icon_state = "bonearmor"
inhand_icon_state = "bonearmor"
blood_overlay_type = "armor"
armor = list(BLUNT = 35, PUNCTURE = 25, SLASH = 0, LASER = 25, ENERGY = 35, BOMB = 25, BIO = 0, FIRE = 50, ACID = 50)
armor = list(BLUNT = 45, PUNCTURE = 25, SLASH = 10, LASER = 25, ENERGY = 35, BOMB = 25, BIO = 0, FIRE = 50, ACID = 50)
body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS

/obj/item/clothing/suit/armor/bulletproof
Expand All @@ -208,7 +208,7 @@
icon_state = "bulletproof"
inhand_icon_state = "armor"
blood_overlay_type = "armor"
armor = list(BLUNT = 15, PUNCTURE = 60, SLASH = 25, LASER = 10, ENERGY = 10, BOMB = 40, BIO = 0, FIRE = 50, ACID = 50)
armor = list(BLUNT = 25, PUNCTURE = 60, SLASH = 35, LASER = 10, ENERGY = 10, BOMB = 40, BIO = 0, FIRE = 50, ACID = 50)
strip_delay = 70
equip_delay_other = 50
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON | CLOTHING_TESHARI_VARIATION | CLOTHING_VOX_VARIATION
Expand All @@ -222,7 +222,7 @@
body_parts_covered = CHEST|GROIN|ARMS
cold_protection = CHEST|GROIN|ARMS
heat_protection = CHEST|GROIN|ARMS
armor = list(BLUNT = 10, PUNCTURE = 10, SLASH = 0, LASER = 60, ENERGY = 60, BOMB = 0, BIO = 0, FIRE = 100, ACID = 100)
armor = list(BLUNT = 20, PUNCTURE = 10, SLASH = 10, LASER = 60, ENERGY = 60, BOMB = 0, BIO = 0, FIRE = 100, ACID = 100)
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
var/hit_reflect_chance = 50

Expand All @@ -236,7 +236,7 @@
name = "private investigator's armor vest"
desc = "An armored vest with a private investigator's badge on it."
icon_state = "detective-armor"
armor = list(BLUNT = 20, PUNCTURE = 30, SLASH = 10, LASER = 20, ENERGY = 30, BOMB = 25, BIO = 0, FIRE = 50, ACID = 50)
armor = list(BLUNT = 30, PUNCTURE = 30, SLASH = 20, LASER = 20, ENERGY = 30, BOMB = 25, BIO = 0, FIRE = 50, ACID = 50)
resistance_flags = FLAMMABLE
dog_fashion = null
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON | CLOTHING_TESHARI_VARIATION | CLOTHING_VOX_VARIATION
Expand All @@ -250,7 +250,7 @@
desc = "This vest appears to be made of of highly flexible materials that absorb impacts with ease."
icon_state = "infiltrator"
inhand_icon_state = "infiltrator"
armor = list(BLUNT = 40, PUNCTURE = 40, SLASH = 0, LASER = 30, ENERGY = 40, BOMB = 70, BIO = 0, FIRE = 100, ACID = 100)
armor = list(BLUNT = 50, PUNCTURE = 40, SLASH = 10, LASER = 30, ENERGY = 40, BOMB = 70, BIO = 0, FIRE = 100, ACID = 100)
resistance_flags = FIRE_PROOF | ACID_PROOF
strip_delay = 80
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION | CLOTHING_TESHARI_VARIATION | CLOTHING_VOX_VARIATION
Expand All @@ -260,7 +260,7 @@
desc = "A tactical suit first developed in a joint effort by the defunct IS-ERI and Mars Executive Outcomes in 2321 for military operations. It has a minor slowdown, but offers decent protection."
icon_state = "heavy"
inhand_icon_state = "swat_suit"
armor = list(BLUNT = 40, PUNCTURE = 20, SLASH = 60, LASER = 30, ENERGY = 40, BOMB = 50, BIO = 90, FIRE = 100, ACID = 100)
armor = list(BLUNT = 50, PUNCTURE = 20, SLASH = 70, LASER = 30, ENERGY = 40, BOMB = 50, BIO = 90, FIRE = 100, ACID = 100)
strip_delay = 120
resistance_flags = FIRE_PROOF | ACID_PROOF
clothing_flags = THICKMATERIAL
Expand Down
Loading

0 comments on commit b15c36b

Please sign in to comment.