cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 20:23:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14096 from Novacat/nova-basicfixes

Browse Source 
Trash pile adjustments
This commit is contained in:
Heroman3003
2022-11-21 14:33:14 +10:00
committed by CHOMPStation2
parent 99f0a27b9f
commit 2e7c58bfa8
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/game/objects/structures/trash_pile_vr.dm
View File

@@ -22,8 +22,6 @@
/obj/item/weapon/bluespace_harpoon, /obj/item/weapon/bluespace_harpoon,
/obj/item/clothing/glasses/thermal/syndi, /obj/item/clothing/glasses/thermal/syndi,
/obj/item/weapon/gun/energy/netgun, /obj/item/weapon/gun/energy/netgun,
/obj/item/weapon/gun/projectile/pirate,
/obj/item/clothing/accessory/permit/gun,
/obj/item/weapon/gun/projectile/dartgun, /obj/item/weapon/gun/projectile/dartgun,
/obj/item/clothing/gloves/black/bloodletter, /obj/item/clothing/gloves/black/bloodletter,
/obj/item/weapon/gun/energy/mouseray/metamorphosis /obj/item/weapon/gun/energy/mouseray/metamorphosis
@@ -270,7 +268,7 @@
prob(1);/obj/item/device/flashlight/glowstick/yellow, prob(1);/obj/item/device/flashlight/glowstick/yellow,
prob(1);/obj/item/device/flashlight/pen, prob(1);/obj/item/device/flashlight/pen,
prob(1);/obj/item/device/paicard, prob(1);/obj/item/device/paicard,
prob(1);/obj/item/weapon/card/emag, prob(1);/obj/item/clothing/accessory/permit/gun,
prob(1);/obj/item/clothing/mask/gas/voice, prob(1);/obj/item/clothing/mask/gas/voice,
prob(1);/obj/item/weapon/spacecash/c100, prob(1);/obj/item/weapon/spacecash/c100,
prob(1);/obj/item/weapon/spacecash/c50, prob(1);/obj/item/weapon/spacecash/c50,
@@ -302,6 +300,7 @@
prob(2);/obj/item/clothing/under/hyperfiber/bluespace, prob(2);/obj/item/clothing/under/hyperfiber/bluespace,
prob(2);/obj/item/selectable_item/chemistrykit/size, prob(2);/obj/item/selectable_item/chemistrykit/size,
prob(2);/obj/item/selectable_item/chemistrykit/gender, prob(2);/obj/item/selectable_item/chemistrykit/gender,
prob(2);/obj/item/clothing/gloves/bluespace/emagged,
prob(1);/obj/item/clothing/suit/storage/vest/heavy/merc, prob(1);/obj/item/clothing/suit/storage/vest/heavy/merc,
prob(1);/obj/item/device/nif/bad, prob(1);/obj/item/device/nif/bad,
prob(1);/obj/item/device/radio_jammer, prob(1);/obj/item/device/radio_jammer,
@@ -317,6 +316,8 @@
prob(1);/obj/item/device/survivalcapsule/popcabin, prob(1);/obj/item/device/survivalcapsule/popcabin,
prob(1);/obj/item/weapon/reagent_containers/syringe/steroid, prob(1);/obj/item/weapon/reagent_containers/syringe/steroid,
prob(1);/obj/item/capture_crystal, prob(1);/obj/item/capture_crystal,
prob(1);/obj/item/device/perfect_tele/one_beacon,
prob(1);/obj/item/clothing/gloves/bluespace,
prob(1);/obj/item/weapon/gun/energy/mouseray) prob(1);/obj/item/weapon/gun/energy/mouseray)
var/obj/item/I = new path() var/obj/item/I = new path()

9
code/modules/clothing/under/miscellaneous_vr.dm
View File

@@ -178,6 +178,15 @@
user.visible_message("<span class='notice'>\The [user] swipes the [emag_source] over the \the [src].</span>","<span class='notice'>You swipes the [emag_source] over the \the [src].</span>") user.visible_message("<span class='notice'>\The [user] swipes the [emag_source] over the \the [src].</span>","<span class='notice'>You swipes the [emag_source] over the \the [src].</span>")
return 1 return 1
/obj/item/clothing/gloves/bluespace/emagged
emagged = TRUE
/obj/item/clothing/gloves/bluespace/emagged/Initialize()
. = ..()
target_size = (rand(1,300)) /100
if(target_size < 0.1)
target_size = 0.1
//Same as Nanotrasen Security Uniforms //Same as Nanotrasen Security Uniforms
/obj/item/clothing/under/ert /obj/item/clothing/under/ert
armor = list(melee = 5, bullet = 10, laser = 10, energy = 5, bomb = 5, bio = 0, rad = 0) armor = list(melee = 5, bullet = 10, laser = 10, energy = 5, bomb = 5, bio = 0, rad = 0)