mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-21 19:19:12 +01:00
Various fixes (#16176)
-Patches map-spawn random objects inside loot piles -Adds counter-clockwise rotation to many objects -Prevents borers from crashing VR -Tweaks blood drying to not queue dry timers on mapload -Prevents adding grabs to crates -Fixes look up verb when outdoors -Lets vehicles fall through open space -Lets the cargo tug dangerously use stairs -Fixes med/sec bot runtimes -Fixes TECH_MAGNETS incorrect define -Fixes damage/stumblevore procing every step when riding taurs/borgs while confused
This commit is contained in:
@@ -14,7 +14,7 @@
|
||||
|
||||
caliber = "nsfw"
|
||||
|
||||
origin_tech = list(TECH_COMBAT = 7, TECH_MATERIAL = 6, TECH_MAGNETS = 4)
|
||||
origin_tech = list(TECH_COMBAT = 7, TECH_MATERIAL = 6, TECH_MAGNET = 4)
|
||||
|
||||
fire_sound = 'sound/weapons/Taser.ogg'
|
||||
|
||||
@@ -65,8 +65,8 @@
|
||||
chambered = new_batt
|
||||
update_charge()
|
||||
update_icon()
|
||||
var/mob/living/M = loc // TGMC Ammo HUD
|
||||
if(istype(M)) // TGMC Ammo HUD
|
||||
var/mob/living/M = loc // TGMC Ammo HUD
|
||||
if(istype(M)) // TGMC Ammo HUD
|
||||
M?.hud_used.update_ammo_hud(M, src)
|
||||
|
||||
/obj/item/weapon/gun/projectile/cell_loaded/attack_self(mob/user)
|
||||
@@ -143,7 +143,7 @@
|
||||
desc = "A microbattery holder for a cell-based variable weapon."
|
||||
icon = 'icons/obj/ammo_vr.dmi'
|
||||
icon_state = "cell_mag"
|
||||
origin_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 5, TECH_MAGNETS = 3)
|
||||
origin_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 5, TECH_MAGNET = 3)
|
||||
caliber = "nsfw"
|
||||
ammo_type = /obj/item/ammo_casing/microbattery
|
||||
initial_ammo = 0
|
||||
@@ -284,7 +284,7 @@
|
||||
new /obj/item/ammo_casing/microbattery/medical/stabilize2(src)
|
||||
new /obj/item/ammo_casing/microbattery/medical/haste(src)
|
||||
new /obj/item/ammo_casing/microbattery/medical/resist(src)
|
||||
|
||||
|
||||
// TGMC Ammo HUD: Custom handling for cell-loaded weaponry.
|
||||
/*
|
||||
/obj/item/weapon/gun/projectile/cell_loaded/get_ammo_type()
|
||||
@@ -299,7 +299,7 @@
|
||||
return 0 // We're not chambered, so we have 0 rounds loaded.
|
||||
|
||||
var/obj/item/ammo_casing/microbattery/batt = chambered
|
||||
|
||||
|
||||
var/shots
|
||||
if(ammo_magazine) // Check how much ammo we have
|
||||
for(var/obj/item/ammo_casing/microbattery/bullet as anything in ammo_magazine.stored_ammo)
|
||||
@@ -310,4 +310,4 @@
|
||||
else // We're out of shots.
|
||||
return 0
|
||||
else // Else, we're unloaded/don't have a magazine.
|
||||
return 0
|
||||
return 0
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
desc = "A miniature nanite fabricator for a medigun."
|
||||
catalogue_data = list(/datum/category_item/catalogue/information/organization/vey_med)
|
||||
icon_state = "ml3m_batt"
|
||||
origin_tech = list(TECH_BIO = 2, TECH_MATERIAL = 1, TECH_MAGNETS = 2)
|
||||
origin_tech = list(TECH_BIO = 2, TECH_MATERIAL = 1, TECH_MAGNET = 2)
|
||||
|
||||
/obj/item/projectile/beam/medical_cell
|
||||
name = "\improper healing beam"
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
description_antag = ""
|
||||
allowed_magazines = list(/obj/item/ammo_magazine/cell_mag/combat/prototype)
|
||||
|
||||
origin_tech = list(TECH_COMBAT = 7, TECH_MATERIAL = 4, TECH_MAGNETS = 3)
|
||||
origin_tech = list(TECH_COMBAT = 7, TECH_MATERIAL = 4, TECH_MAGNET = 3)
|
||||
|
||||
|
||||
// The Magazine //
|
||||
@@ -39,7 +39,7 @@
|
||||
max_ammo = 2
|
||||
x_offset = 6
|
||||
catalogue_data = null
|
||||
origin_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 3, TECH_MAGNETS = 2)
|
||||
origin_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 3, TECH_MAGNET = 2)
|
||||
|
||||
|
||||
// The Pack //
|
||||
@@ -74,4 +74,4 @@
|
||||
new /obj/item/ammo_casing/microbattery/combat/stun(src)
|
||||
new /obj/item/ammo_casing/microbattery/combat/stun(src)
|
||||
new /obj/item/ammo_casing/microbattery/combat/net(src)
|
||||
new /obj/item/ammo_casing/microbattery/combat/ion(src)
|
||||
new /obj/item/ammo_casing/microbattery/combat/ion(src)
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
name = "\'NSFW\' microbattery - UNKNOWN"
|
||||
desc = "A miniature battery for an energy weapon."
|
||||
catalogue_data = list(/datum/category_item/catalogue/information/organization/khi)
|
||||
origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 1, TECH_MAGNETS = 2)
|
||||
origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 1, TECH_MAGNET = 2)
|
||||
|
||||
/obj/item/ammo_casing/microbattery/combat/lethal
|
||||
name = "\'NSFW\' microbattery - LETHAL"
|
||||
@@ -112,4 +112,4 @@
|
||||
SStranscore.m_backup(L.mind,nif,one_time = TRUE)
|
||||
L.gib()
|
||||
|
||||
..()
|
||||
..()
|
||||
|
||||
Reference in New Issue
Block a user