diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index eff6d34848..18e45b6c40 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -347,7 +347,7 @@ /obj/item/device/flashlight/flare name = "flare" desc = "A red standard-issue flare. There are instructions on the side reading 'pull cord, make light'." - w_class = ITEMSIZE_SMALL + w_class = ITEMSIZE_TINY // CHOMPedit: These can fit in more places. light_range = 8 // Pretty bright. light_power = 0.8 light_color = LIGHT_COLOR_FLARE @@ -415,7 +415,7 @@ /obj/item/device/flashlight/glowstick name = "green glowstick" desc = "A green military-grade chemical light." - w_class = ITEMSIZE_SMALL + w_class = ITEMSIZE_TINY // CHOMPedit: These can fit in more places. light_system = MOVABLE_LIGHT light_range = 4 light_power = 0.9 diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index f930b12ddc..d61f0d0310 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -224,8 +224,8 @@ /obj/item/weapon/storage/box/flare name = "box of flares" - desc = "A box containing 4 flares." - starts_with = list(/obj/item/device/flashlight/flare = 4) + desc = "A box containing 14 flares." // CHOMPedit: More flares. + starts_with = list(/obj/item/device/flashlight/flare = 14) // CHOMPedit: More flares. /obj/item/weapon/storage/box/trackimp name = "boxed tracking implant kit" diff --git a/code/game/objects/items/weapons/storage/pouches.dm b/code/game/objects/items/weapons/storage/pouches.dm index 1eecc92794..a8b7bccb30 100644 --- a/code/game/objects/items/weapons/storage/pouches.dm +++ b/code/game/objects/items/weapons/storage/pouches.dm @@ -16,7 +16,7 @@ pocketable = TRUE var/insert_delay = 0 SECONDS - var/remove_delay = 2 SECONDS + var/remove_delay = 0 SECONDS // CHOMPedit: Faster, QOL. /obj/item/weapon/storage/pouch/stall_insertion(obj/item/W, mob/user) // No delay if you have the pouch in your hands @@ -49,14 +49,14 @@ desc = "This storage pouch can be used to provide a good amount of additional storage for quick access." icon_state = "large_generic" max_storage_space = ITEMSIZE_COST_SMALL*6 - remove_delay = 3 SECONDS //VOREStation Add: Slightly more cumbersome + remove_delay = 1 SECONDS // CHOMPedit: Faster. /obj/item/weapon/storage/pouch/small name = "storage pouch (small)" desc = "This storage pouch can be used to provide a small amount of additional storage for quick access." icon_state = "small_generic" max_storage_space = ITEMSIZE_COST_SMALL*2 - remove_delay = 1 SECOND //VOREStation Add: Slightly less cumbersome +// remove_delay = 1 SECOND // Chompedit: Faster. /obj/item/weapon/storage/pouch/ammo name = "storage pouch (ammo)" @@ -167,12 +167,13 @@ name = "storage pouch (flares)" desc = "This storage pouch can be used to provide some additional storage for quick access. Can only hold flares and glowsticks." icon_state = "flare" - storage_slots = 5 + storage_slots = 14 // CHOMPedit: Full box of flares. + remove_delay = 0 // CHOMPedit: Quick access to light sources. can_hold = list(/obj/item/device/flashlight/flare, /obj/item/device/flashlight/glowstick) /obj/item/weapon/storage/pouch/flares/full_flare - starts_with = list(/obj/item/device/flashlight/flare = 5) + starts_with = list(/obj/item/device/flashlight/flare = 14) // CHOMPedit: Full box of flares. /obj/item/weapon/storage/pouch/flares/full_glow - starts_with = list(/obj/item/device/flashlight/glowstick = 5) + starts_with = list(/obj/item/device/flashlight/glowstick = 14) // CHOMPedit: Full box of glowsticks. /obj/item/weapon/storage/pouch/flares/update_icon() cut_overlays() diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index f2c153fe99..9ff1be96a2 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -543,7 +543,7 @@ return 1 /obj/item/clothing/suit/armor/pcarrier/explorer - name = "explorer suit" + name = "explorer plate carrier" // CHOMPedit: Clarity for vendors. desc = "A lightweight explorer plate carrier. It can be equipped with armor plates, but only protects from the cold on it's own." icon_state = "explorer" flags = THICKMATERIAL diff --git a/code/modules/mining/fulton.dm b/code/modules/mining/fulton.dm index 2186e799f3..c7da926f3f 100644 --- a/code/modules/mining/fulton.dm +++ b/code/modules/mining/fulton.dm @@ -8,7 +8,7 @@ var/global/list/total_extraction_beacons = list() w_class = ITEMSIZE_NORMAL var/obj/structure/extraction_point/beacon var/list/beacon_networks = list("station") - var/uses_left = 5 // CHOMPedit: More uses. + var/uses_left = 3 var/can_use_indoors = TRUE // CHOMPedit: Can be used anywhere. var/safe_for_living_creatures = 1 @@ -140,7 +140,7 @@ var/global/list/total_extraction_beacons = list() /obj/item/fulton_core name = "bluespace extraction beacon signaller" - desc = "Emits a signal which bluespace Fulton recovery devices can lock onto. Activate in hand to create a beacon." + desc = "Emits a signal which bluespace Fulton recovery devices can lock onto. Activate in hand to create a beacon. Cannot be moved after placing!" icon = 'icons/obj/fulton.dmi' icon_state = "extraction_pointoff" diff --git a/code/modules/organs/internal/eyes.dm b/code/modules/organs/internal/eyes.dm index 79d22fe577..902b841ad2 100644 --- a/code/modules/organs/internal/eyes.dm +++ b/code/modules/organs/internal/eyes.dm @@ -10,6 +10,7 @@ /obj/item/organ/internal/eyes/robotize() ..() name = "optical sensor" + innate_flash_protection = FLASH_PROTECTION_MAJOR // CHOMPedit: So synths can repair brute damage on themselves without needing eye protection, like many other servers. QOL. verbs |= /obj/item/organ/internal/eyes/proc/change_eye_color /obj/item/organ/internal/eyes/robot diff --git a/code/modules/projectiles/projectile/magnetic.dm b/code/modules/projectiles/projectile/magnetic.dm index 588a20820e..ec72b75e08 100644 --- a/code/modules/projectiles/projectile/magnetic.dm +++ b/code/modules/projectiles/projectile/magnetic.dm @@ -5,8 +5,8 @@ icon_state = "rod" fire_sound = 'sound/weapons/railgun.ogg' damage = 65 - stun = 1 - weaken = 1 + stun = 0 // CHOMPedit: Guaranteed stuns from a gun bad. + weaken = 0 // CHOMPedit: Guaranteed stuns from a gun bad. penetrating = 5 armor_penetration = 70 hud_state = "alloy_spike" diff --git a/code/modules/projectiles/projectile/magnetic_ch.dm b/code/modules/projectiles/projectile/magnetic_ch.dm index 41d11cfe40..9e14ddb072 100644 --- a/code/modules/projectiles/projectile/magnetic_ch.dm +++ b/code/modules/projectiles/projectile/magnetic_ch.dm @@ -2,8 +2,8 @@ name = "rapid flechette" icon_state = "flechette" fire_sound = 'sound/weapons/rapidslice.ogg' - damage = 10 - armor_penetration = 35 + damage = 15 + armor_penetration = 60 // Now that stun's gone from the parent type, we can boost this back up. hud_state = "alloy_spike" /obj/item/projectile/bullet/magnetic/fuelrod/blitz diff --git a/icons/inventory/pockets/item.dmi b/icons/inventory/pockets/item.dmi index 4673c05dce..d1a5653585 100644 Binary files a/icons/inventory/pockets/item.dmi and b/icons/inventory/pockets/item.dmi differ diff --git a/modular_chomp/code/game/machinery/vending.dm b/modular_chomp/code/game/machinery/vending.dm new file mode 100644 index 0000000000..41b97760d2 --- /dev/null +++ b/modular_chomp/code/game/machinery/vending.dm @@ -0,0 +1,126 @@ +/* CONTAINS: + Explo equipment vending machines +*/ + +/obj/machinery/vending/exploration_armor + name = "Exploration Equipment Vendor" + desc = "A large vending machine stocked with surplus uniforms, armor and pouches for exploration members." + vend_delay = 1 + icon_state = "sec" // Placeholder + req_one_access = list(access_explorer,access_pilot,access_medical_equip) + products = list( + // Clothing + /obj/item/clothing/under/explorer = 10, + /obj/item/clothing/shoes/boots/winter/explorer = 10, + /obj/item/clothing/gloves/black = 10, + /obj/item/weapon/storage/belt/explorer = 10, + // Armor + /obj/item/clothing/suit/armor/pcarrier/explorer/light = 10, + /obj/item/clothing/suit/storage/hooded/explorer = 10, + /obj/item/clothing/head/helmet/explorer = 10, + // Pouches + /obj/item/weapon/storage/pouch = 10, + /obj/item/weapon/storage/pouch/ammo = 10, + /obj/item/weapon/storage/pouch/flares/full_flare = 10, + /obj/item/weapon/storage/pouch/holster = 5, + // Misc + /obj/item/device/radio/headset/explorer = 10, + /obj/item/device/radio/headset/explorer/alt = 10, + /obj/item/clothing/mask/gas/explorer = 10, + /obj/item/weapon/storage/backpack/satchel/explorer = 10, + /obj/item/weapon/storage/backpack/dufflebag/explorer = 10, + /obj/item/weapon/storage/backpack/explorer = 10 + ) + +/obj/machinery/vending/exploration_weapons + name = "Exploration Weapon Vendor" + desc = "A large vending machine stocked with surplus phase, laser and ballistic weaponry for exploration members." + vend_delay = 1 + icon_state = "sec" // Placeholder + req_one_access = list(access_explorer,access_pilot,access_medical_equip) + products = list( + // Phase + /obj/item/weapon/gun/energy/locked/phasegun/pistol = 10, + /obj/item/weapon/gun/energy/locked/phasegun = 10, + /obj/item/weapon/gun/energy/locked/phasegun/rifle = 5, + // Laser + /obj/item/weapon/gun/energy/laser = 5, + // Ballistic + /obj/item/weapon/gun/projectile/colt = 5, + // Ammo + /obj/item/weapon/cell/device/weapon = 25, + /obj/item/ammo_magazine/m45 = 25, + // Melee + /obj/item/weapon/material/knife/tacknife/survival = 10, + /obj/item/weapon/material/knife/machete = 10, + // Holsters + /obj/item/clothing/accessory/holster/machete = 10, + /obj/item/clothing/accessory/holster/leg = 5, + /obj/item/clothing/accessory/holster/hip = 5, + /obj/item/clothing/accessory/holster/waist = 5, + /obj/item/clothing/accessory/holster/armpit = 5 + ) + +/obj/machinery/vending/exploration_misc + name = "Exploration Misc Vendor" + desc = "A large vending machine stocked with an assortment of miscellaneous equipment handy for explorers." + vend_delay = 1 + icon_state = "sec" // Placeholder + req_one_access = list(access_explorer,access_pilot,access_medical_equip) + products = list( + /obj/item/device/cataloguer = 10, + /obj/item/weapon/cell/device = 10, + /obj/item/device/geiger = 10, + /obj/item/device/gps/explorer = 10, + /obj/item/device/flashlight = 10, + /obj/item/weapon/storage/backpack/parachute = 5, + /obj/item/weapon/storage/box/flare = 5, + /obj/item/weapon/storage/box/cdeathalarm_kit = 1, + /obj/item/weapon/storage/box/backup_kit = 1 + ) + +/obj/machinery/vending/exploration_pilot + name = "Pilot Equipment Vendor" + desc = "A large vending machine stocked with surplus uniforms and equipment for pilots." + vend_delay = 1 + icon_state = "sec" // Placeholder + req_access = list(access_pilot) + products = list( + // Clothing + /obj/item/clothing/under/rank/pilot1 = 5, + /obj/item/clothing/suit/storage/toggle/bomber/pilot = 5, + /obj/item/clothing/head/pilot = 5, + /obj/item/clothing/gloves/fingerless = 5, + /obj/item/clothing/shoes/boots/winter/explorer = 5, + // Pouches + /obj/item/weapon/storage/pouch/eng_tool = 5, + /obj/item/weapon/storage/pouch/eng_supply = 5, + /obj/item/weapon/storage/pouch/eng_parts = 5 + ) + +/obj/machinery/vending/exploration_fieldmedic + name = "Field Medic Equipment Vendor" + desc = "A large vending machine stocked with surplus uniforms and equipment for field medics." + vend_delay = 1 + icon_state = "sec" // Placeholder + req_access = list(access_medical_equip) + products = list( + // Clothing + /obj/item/clothing/under/explorer = 5, + /obj/item/clothing/shoes/boots/winter/explorer = 5, + /obj/item/clothing/gloves/black = 5, + /obj/item/weapon/storage/belt/medical/emt = 5, + /obj/item/device/radio/headset/sar = 5, + // Pouches + /obj/item/weapon/storage/pouch/medical = 5, + // Medical Equipment + /obj/item/weapon/storage/pill_bottle/bicaridine = 3, + /obj/item/weapon/storage/pill_bottle/kelotane = 3, + /obj/item/weapon/storage/pill_bottle/tramadol = 3, + /obj/item/weapon/storage/pill_bottle/dylovene = 3, + /obj/item/device/healthanalyzer = 5, + /obj/item/bodybag/cryobag = 4, + /obj/item/roller/adv = 2, + /obj/item/extraction_pack = 1, + /obj/item/fulton_core = 1 + ) \ No newline at end of file diff --git a/modular_chomp/code/modules/clothing/shoes/miscellaneous.dm b/modular_chomp/code/modules/clothing/shoes/miscellaneous.dm index 8aa8c53d0b..42759a47a4 100644 --- a/modular_chomp/code/modules/clothing/shoes/miscellaneous.dm +++ b/modular_chomp/code/modules/clothing/shoes/miscellaneous.dm @@ -1,9 +1,10 @@ /obj/item/clothing/shoes/mech_shoes name = "mech shoes" desc = "Thud thud." - icon_state = "nothing" + icon_state = "jackboots" armor = list(melee = 30, bullet = 10, laser = 10, energy = 15, bomb = 20, bio = 0, rad = 0) // Same as loadout jackboots. siemens_coefficient = 0.7 // Same as loadout jackboots. + can_hold_knife = 1 force = 2 species_restricted = null var/list/squeak_sound = list("mechstep"=1) //Squeak sound list. Necessary so our subtypes can have different sounds loaded into their component diff --git a/modular_chomp/maps/submaps/shelters/Dinner-25x25.dmm b/modular_chomp/maps/submaps/shelters/Dinner-25x25.dmm index c5acc780e9..e821c09d6c 100644 --- a/modular_chomp/maps/submaps/shelters/Dinner-25x25.dmm +++ b/modular_chomp/maps/submaps/shelters/Dinner-25x25.dmm @@ -606,6 +606,11 @@ }, /turf/simulated/floor/tiled/hydro, /area/survivalpod/superpose/Dinner) +"da" = ( +/obj/structure/simple_door/wood, +/obj/structure/fans/tiny, +/turf/simulated/floor/tiled/white, +/area/survivalpod/superpose/Dinner) "dQ" = ( /obj/structure/window/reinforced/survival_pod{ dir = 4 @@ -686,6 +691,11 @@ /obj/structure/kitchenspike, /turf/simulated/floor/tiled/freezer, /area/survivalpod/superpose/Dinner) +"Rx" = ( +/obj/structure/simple_door/wood, +/obj/structure/fans/tiny, +/turf/simulated/floor/tiled, +/area/survivalpod/superpose/Dinner) "WB" = ( /obj/structure/table/woodentable, /obj/item/device/flashlight/lamp, @@ -943,8 +953,8 @@ ab ab ab ad -az -az +da +da ad ab ab @@ -1404,7 +1414,7 @@ ad ad ad ad -aA +Rx ad ad ad diff --git a/vorestation.dme b/vorestation.dme index 31e24f470a..cf73f1397f 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -4643,6 +4643,7 @@ #include "modular_chomp\code\game\machinery\paradox.dm" #include "modular_chomp\code\game\machinery\petrification.dm" #include "modular_chomp\code\game\machinery\portable_turret.dm" +#include "modular_chomp\code\game\machinery\vending.dm" #include "modular_chomp\code\game\machinery\virtual_reality\vr_console.dm" #include "modular_chomp\code\game\objects\items.dm" #include "modular_chomp\code\game\objects\mob_spawner.dm"