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

Merge pull request #5587 from CHOMPStation2/upstream-merge-14354

Browse Source 
[MIRROR] Event Stuff Bugfix/Balance Pass
This commit is contained in:
Nadyr
2023-01-27 10:17:52 -05:00
committed by GitHub
parent 57ae8c01ee 8396df2e7b
commit 914f627dc0
10 changed files with 50 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/spacesuits/rig/suits/alien_vr.dm
+5
View File
@@ -0,0 +1,5 @@
/obj/item/weapon/rig/breacher
armor = list(melee = 60, bullet = 45, laser = 45, energy = 10, bomb = 50, bio = 100, rad = 20)
/obj/item/weapon/rig/breacher/fancy
armor = list(melee = 85, bullet = 80, laser = 80, energy = 40, bomb = 80, bio = 100, rad = 60) //Still a tank just not indestructable
code/modules/clothing/spacesuits/rig/suits/combat_vr.dm
+5
View File
@@ -0,0 +1,5 @@
/obj/item/weapon/rig/combat
armor = list(melee = 80, bullet = 70, laser = 60, energy = 15, bomb = 80, bio = 100, rad = 60)
/obj/item/weapon/rig/military
armor = list(melee = 80, bullet = 75, laser = 65, energy = 15, bomb = 80, bio = 100, rad = 40)
code/modules/clothing/spacesuits/rig/suits/ert_vr.dm
+1 -1
View File
@@ -10,4 +10,4 @@
)
/obj/item/weapon/rig/ert/assetprotection
armor = list(melee = 80, bullet = 65, laser = 50, energy = 15, bomb = 80, bio = 100, rad = 60)
armor = list(melee = 80, bullet = 70, laser = 60, energy = 15, bomb = 80, bio = 100, rad = 60)
code/modules/clothing/spacesuits/void/ert_vr.dm
+2 -1
View File
@@ -3,7 +3,7 @@
desc = "Utilizing cutting edge tech from Hephaestus, the Mark VII is the latest and greatest in semi-powered personal protection systems; like the civilian AutoLok suit, the Mark VII can automatically adapt to fit most species without issue via RFID tags. This significantly reduces the time required for response teams to suit up, as it eliminates the need for dedicated cycler units. It also has an integrated, unremovable helmet. Standard air tanks, suit coolers, and magboots may be installed and removed as needed."
icon_state = "ertsuit"
item_state = "ertsuit"
armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 100, rad = 100)
armor = list(melee = 65, bullet = 55, laser = 55,energy = 15, bomb = 50, bio = 100, rad = 100)
slowdown = 0.5
siemens_coefficient = 0.5
species_restricted = list("exclude",SPECIES_DIONA,SPECIES_VOX,SPECIES_TESHARI,SPECIES_ALTEVIAN) //this thing can autoadapt
@@ -15,6 +15,7 @@
min_pressure_protection = 0 * ONE_ATMOSPHERE
max_pressure_protection = 15* ONE_ATMOSPHERE
max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE+10000
allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword,/obj/item/weapon/handcuffs)
/obj/item/clothing/suit/space/void/responseteam/command
name = "Mark VII-C Emergency Response Team Commander Suit"
code/modules/clothing/spacesuits/void/event_vr.dm
+2 -2
View File
@@ -240,7 +240,7 @@
default_worn_icon = 'icons/inventory/suit/mob_vr_altevian.dmi'
icon_state = "rig-heartbreaker"
armor = list("melee" = 90, "bullet" = 90, "laser" = 90, "energy" = 90, "bomb" = 90, "bio" = 100, "rad" = 80)
armor = list(melee = 70, bullet = 70, laser = 70, energy = 30, bomb = 80, bio = 100, rad = 40)
species_restricted = list(SPECIES_ALTEVIAN)
no_cycle = TRUE
@@ -254,7 +254,7 @@
default_worn_icon = 'icons/inventory/head/mob_vr_altevian.dmi'
icon_state = "rig0-heartbreaker"
armor = list("melee" = 90, "bullet" = 90, "laser" = 90, "energy" = 90, "bomb" = 90, "bio" = 100, "rad" = 80)
armor = list(melee = 70, bullet = 70, laser = 70, energy = 30, bomb = 80, bio = 100, rad = 40)
species_restricted = list(SPECIES_ALTEVIAN)
no_cycle = TRUE
code/modules/clothing/spacesuits/void/merc_vr.dm
+11
View File
@@ -0,0 +1,11 @@
/obj/item/clothing/head/helmet/space/void/merc
armor = list(melee = 70, bullet = 60, laser = 40,energy = 15, bomb = 45, bio = 100, rad = 60)
/obj/item/clothing/suit/space/void/merc
armor = list(melee = 70, bullet = 60, laser = 40,energy = 15, bomb = 45, bio = 100, rad = 60)
/obj/item/clothing/head/helmet/space/void/merc/fire
armor = list(melee = 50, bullet = 40, laser = 70, energy = 20, bomb = 60, bio = 100, rad = 50)
/obj/item/clothing/suit/space/void/merc/fire
armor = list(melee = 50, bullet = 40, laser = 70, energy = 20, bomb = 60, bio = 100, rad = 50)
code/modules/projectiles/guns/energy/pump.dm
+3
View File
@@ -183,6 +183,9 @@
scoped_accuracy = 40
one_handed_penalty = 50 // The weapon itself is heavy, and the long barrel makes it hard to hold steady with just one hand.
phase_power = 150 //efficient crank charger
fire_sound = null
charge_cost = 600
fire_delay = 35
projectile_type = /obj/item/projectile/beam/sniper
modifystate = "phrifledmr"
icons/obj/gun.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 132 KiB

After

Width:  |  Height:  |  Size: 132 KiB

maps/offmap_vr/om_ships/shelter_6.dmm
+18 -16
View File
@@ -284,22 +284,24 @@
/obj/item/ammo_magazine/m545,
/obj/item/weapon/gun/projectile/shotgun/pump/combat,
/obj/item/weapon/gun/projectile/shotgun/pump/combat,
/obj/item/weapon/storage/box/shotgunshells/large,
/obj/item/weapon/storage/box/shotgunshells/large,
/obj/item/weapon/storage/box/shotgunshells/large,
/obj/item/weapon/storage/box/shotgunshells/large,
/obj/item/weapon/storage/box/shotgunammo/large,
/obj/item/weapon/storage/box/shotgunammo/large,
/obj/item/weapon/storage/box/shotgunammo/large,
/obj/item/weapon/storage/box/shotgunammo/large,
/obj/item/weapon/storage/box/empshells/large,
/obj/item/weapon/storage/box/empshells/large,
/obj/item/weapon/storage/box/beanbags,
/obj/item/weapon/storage/box/beanbags,
/obj/item/weapon/storage/box/stunshells,
/obj/item/weapon/storage/box/stunshells,
/obj/item/weapon/storage/box/flashshells,
/obj/item/weapon/storage/box/flashshells,
/obj/item/ammo_magazine/ammo_box/b12g/pellet,
/obj/item/ammo_magazine/ammo_box/b12g/pellet,
/obj/item/ammo_magazine/ammo_box/b12g/pellet,
/obj/item/ammo_magazine/ammo_box/b12g/pellet,
/obj/item/ammo_magazine/ammo_box/b12g,
/obj/item/ammo_magazine/ammo_box/b12g,
/obj/item/ammo_magazine/ammo_box/b12g,
/obj/item/ammo_magazine/ammo_box/b12g,
/obj/item/ammo_magazine/ammo_box/b12g/emp,
/obj/item/ammo_magazine/ammo_box/b12g/emp,
/obj/item/ammo_magazine/ammo_box/b12g/beanbag,
/obj/item/ammo_magazine/ammo_box/b12g/beanbag,
/obj/item/ammo_magazine/ammo_box/b12g/stunshell,
/obj/item/ammo_magazine/ammo_box/b12g/stunshell,
/obj/item/ammo_magazine/ammo_box/b12g/flash,
/obj/item/ammo_magazine/ammo_box/b12g/flash,
/obj/item/ammo_magazine/ammo_box/b12g/flechette,
/obj/item/ammo_magazine/ammo_box/b12g/flechette,
/obj/item/weapon/gun/energy/locked/frontier/carbine/unlocked,
/obj/item/weapon/gun/energy/locked/frontier/carbine/unlocked,
/obj/item/weapon/gun/energy/locked/frontier/carbine/unlocked,
vorestation.dme
+3
View File
@@ -2174,7 +2174,9 @@
#include "code\modules\clothing\spacesuits\rig\modules\specific\vision.dm"
#include "code\modules\clothing\spacesuits\rig\modules\specific\voice.dm"
#include "code\modules\clothing\spacesuits\rig\suits\alien.dm"
#include "code\modules\clothing\spacesuits\rig\suits\alien_vr.dm"
#include "code\modules\clothing\spacesuits\rig\suits\combat.dm"
#include "code\modules\clothing\spacesuits\rig\suits\combat_vr.dm"
#include "code\modules\clothing\spacesuits\rig\suits\ert.dm"
#include "code\modules\clothing\spacesuits\rig\suits\ert_vr.dm"
#include "code\modules\clothing\spacesuits\rig\suits\light.dm"
@@ -2188,6 +2190,7 @@
#include "code\modules\clothing\spacesuits\void\event.dm"
#include "code\modules\clothing\spacesuits\void\event_vr.dm"
#include "code\modules\clothing\spacesuits\void\merc.dm"
#include "code\modules\clothing\spacesuits\void\merc_vr.dm"
#include "code\modules\clothing\spacesuits\void\military_vr.dm"
#include "code\modules\clothing\spacesuits\void\station.dm"
#include "code\modules\clothing\spacesuits\void\station_vr.dm"