cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-24 13:47:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Random Changes, Fixes, Additions Go (#7128)

Browse Source
This commit is contained in:
FluffMedic
2023-11-07 13:32:14 +01:00
committed by GitHub
parent 4cc6ae3d01
commit 58d26cc799
15 changed files with 3066 additions and 1552 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_chomp/code/modules/client/preference_setup/loadout/loadout_suit.dm
+12 -1
View File
@@ -14,4 +14,15 @@
"Green Plate Carrier" = /obj/item/clothing/suit/armor/pcarrier/green,
"Tan Plate Carrier" = /obj/item/clothing/suit/armor/pcarrier/tan
)
gear_tweaks += new/datum/gear_tweak/path(pcarriers)
gear_tweaks += new/datum/gear_tweak/path(pcarriers)
/datum/gear/suit/winterhood
display_name = "Winter Hood"
path = /obj/item/clothing/head/hood/cloak/winter
cost = 0
/datum/gear/suit/martianminer
display_name = "Martian Miner Coat"
path = /obj/item/clothing/suit/storage/vest/martian_miner/unarmored
cost = 1
modular_chomp/code/modules/clothing/suits/armor.dm
+11
View File
@@ -3,3 +3,14 @@
SPECIES_TESHARI = 'icons/inventory/suit/mob_teshari.dmi',
SPECIES_VOX = 'modular_chomp/icons/inventory/suit/mob_vox.dmi'
)
/obj/item/clothing/suit/armor/pcarrier/primative
name = "makeshift suit"
desc = "A lightweight makeshift plate carrier vest"
slowdown = 0.5
icon_state = "explorer"
flags = THICKMATERIAL
min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE
cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
/obj/item/clothing/suit/storage/vest/martian_miner/unarmored
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 25, bio = 0, rad = 0)
modular_chomp/code/modules/mob/living/carbon/human/species/station/traits/negative.dm
+1 -1
View File
@@ -9,5 +9,5 @@
custom_only = FALSE
can_take = ORGANICS
var_changes = list("minimum_breath_pressure" = 22)
var_changes = list("minimum_breath_pressure" = 18)
excludes = list(/datum/trait/positive/light_breather)
modular_chomp/code/modules/mob/living/simple_mob/subtypes/animal/sif.dm
+9
View File
@@ -33,6 +33,15 @@
/mob/living/simple_mob/animal/sif/frostfly
maxHealth = 32
health = 32
armor_soak = list(
"melee" = 0,
"bullet" = 0,
"laser" = 5,
"energy" = 0,
"bomb" = 0,
"bio" = 0,
"rad" = 0
)
/mob/living/simple_mob/vore/aggressive/deathclaw
maxHealth = 100
modular_chomp/code/modules/projectiles/guns/alts.dm
+2
View File
@@ -0,0 +1,2 @@
/obj/item/weapon/gun/energy/zip/craftable
battery_lock = 1 //makeshift gun has flaws
modular_chomp/code/modules/projectiles/precursor/freezegun.dm
+1 -1
View File
@@ -9,7 +9,7 @@
origin_tech = list(TECH_COMBAT = 6, TECH_POWER = 5, TECH_PRECURSOR = 3)
charge_cost = 480 //How much energy is needed to fire.
charge_cost = 120 //How much energy is needed to fire.
accept_cell_type = /obj/item/weapon/cell/device
cell_type = /obj/item/weapon/cell/device/weapon