cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-23 21:12:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Uplink Revamp (#7974)

Browse Source
This commit is contained in:
Geeves
2020-01-15 18:28:11 +01:00
committed by Werner
parent ef7b3fd337
commit 931d56672a
25 changed files with 315 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/heavy_vehicle/equipment/medical.dm
+1 -1
View File
@@ -1,6 +1,6 @@
/obj/item/mecha_equipment/sleeper
name = "\improper exosuit sleeper"
desc = "An exosuit-mounted sleeper designed to mantain patients stabilized on their way to medical facilities."
desc = "An exosuit-mounted sleeper designed to maintain patients stabilized on their way to medical facilities."
icon_state = "mech_sleeper"
restricted_hardpoints = list(HARDPOINT_BACK)
restricted_software = list(MECH_SOFTWARE_MEDICAL)
code/modules/heavy_vehicle/premade/combat.dm
+2 -1
View File
@@ -21,8 +21,9 @@
/mob/living/heavy_vehicle/premade/combat/spawn_mech_equipment()
..()
install_system(new /obj/item/mecha_equipment/mounted_system/taser(src), HARDPOINT_LEFT_HAND)
install_system(new /obj/item/mecha_equipment/mounted_system/blaster(src), HARDPOINT_LEFT_HAND)
install_system(new /obj/item/mecha_equipment/mounted_system/taser/ion(src), HARDPOINT_RIGHT_HAND)
install_system(new /obj/item/mecha_equipment/mounted_system/grenadetear(src), HARDPOINT_RIGHT_SHOULDER)
/obj/item/mech_component/manipulators/combat
name = "combat arms"
code/modules/projectiles/ammunition/boxes.dm
+3 -6
View File
@@ -1,7 +1,4 @@
/obj/item/ammo_magazine/a357
//name = "ammo box (.357)"
//desc = "A box of .357 ammo"
//icon_state = "357"
name = "speed loader (.357)"
icon_state = "T38"
caliber = "357"
@@ -300,7 +297,7 @@
/obj/item/ammo_magazine/c45uzi/empty
initial_ammo = 0
/obj/item/ammo_magazine/tommymag
/obj/item/ammo_magazine/submachinemag
name = "magazine (.45)"
icon_state = "tommy-mag"
mag_type = MAGAZINE
@@ -309,10 +306,10 @@
caliber = ".45"
max_ammo = 20
/obj/item/ammo_magazine/tommymag/empty
/obj/item/ammo_magazine/submachinemag/empty
initial_ammo = 0
/obj/item/ammo_magazine/tommydrum
/obj/item/ammo_magazine/submachinedrum
name = "drum magazine (.45)"
icon_state = "tommy-drum"
w_class = 3 // Bulky ammo doesn't fit in your pockets!
code/modules/projectiles/guns/projectile/automatic.dm
+2 -2
View File
@@ -325,8 +325,8 @@
slot_flags = SLOT_BELT
ammo_type = /obj/item/ammo_casing/c45
load_method = MAGAZINE
magazine_type = /obj/item/ammo_magazine/tommymag
allowed_magazines = list(/obj/item/ammo_magazine/tommymag, /obj/item/ammo_magazine/tommydrum)
magazine_type = /obj/item/ammo_magazine/submachinemag
allowed_magazines = list(/obj/item/ammo_magazine/submachinemag, /obj/item/ammo_magazine/submachinedrum)
fire_sound = 'sound/weapons/tommygun_shoot.ogg'
/obj/item/gun/projectile/automatic/tommygun/update_icon()