cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-11 10:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15856 from shellspeed1/borg-mining-ID-fix-and-premium-KA-return

Browse Source 
Fixes the mining borg point card
This commit is contained in:
silicons
2022-09-23 16:24:36 -07:00
committed by GitHub
parent 354a3af63c c886e2fd24
commit 96384ac667
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/game/objects/items/robot/robot_upgrades.dm
View File

@@ -215,7 +215,6 @@ as performing this in action() will cause the upgrade to end up in the borg inst
C.icon_state = initial(icon_state)
for(var/obj/item/ammo_casing/energy/plasma/weak/L in C.ammo_type)
L.projectile_type = initial(L.projectile_type)
/obj/item/borg/upgrade/tboh
name = "janitor cyborg trash bag of holding"
desc = "A trash bag of holding replacement for the janiborg's standard trash bag."

4
code/modules/mining/machine_vending.dm
View File

@@ -76,7 +76,7 @@
new /datum/data/mining_equipment("Miner Full Replacement", /obj/item/storage/backpack/duffelbag/mining/cloned, 3000),
new /datum/data/mining_equipment("Premium Accelerator", /obj/item/gun/energy/kinetic_accelerator/premiumka, 8000),
new /datum/data/mining_equipment("Premium Kinetic Melee Kit", /obj/item/storage/backpack/duffelbag/mining/glaivekit, 2250),
new /datum/data/mining_equipment("Survival Dagger", /obj/item/kitchen/knife/combat/survival/knuckledagger, 550),
new /datum/data/mining_equipment("Survival Dagger", /obj/item/kitchen/knife/combat/survival/knuckledagger, 550)
)
/datum/data/mining_equipment
@@ -131,7 +131,7 @@
. = list()
var/mob/living/carbon/human/H
var/obj/item/card/id/C
if(ishuman(user))
if(ishuman(user) || iscyborg(user))
H = user
C = H.get_idcard(TRUE)
if(C)