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

Event stuff, but also Squeak component (#7285)

Browse Source
This commit is contained in:
BlackMajor
2023-12-11 14:40:47 +13:00
committed by GitHub
parent 835e207c5c
commit 92c744dfec
32 changed files with 831 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/mining/mine_outcrops.dm
View File

@@ -100,7 +100,7 @@
if (istype(W, /obj/item/weapon/melee/shock_maul))
var/obj/item/weapon/melee/shock_maul/S = W
if(!S.wielded || !S.status)
to_chat(user, "<span class='warning'>\The [src] must be wielded in two hands and powered on to be used for mining!</span>")
to_chat(user, "<span class='warning'>\The [W] must be wielded in two hands and powered on to be used to mine this!</span>") //CHOMPEdit - fix improper name
return
to_chat(user, "<span class='notice'>You pulverize \the [src]!</span>")
for(var/i=0;i<(rand(mindrop,upperdrop));i++)

14
code/modules/mining/mine_turfs.dm
View File

@@ -455,8 +455,8 @@ var/list/mining_overlay_cache = list()
return
var/obj/item/weapon/melee/shock_maul/S = W
if(!S.wielded || !S.status) //if we're not wielded OR not powered up, do nothing
to_chat(user, "<span class='warning'>\The [src] must be wielded in two hands and powered on to be used for mining!</span>")
if(!S.wielded) //CHOMPEdit - slight maul buff
to_chat(user, "<span class='warning'>\The [W] must be wielded in two hands to be used for mining!</span>") //CHOMPEdit - fixed improper name
return
var/newDepth = excavation_level + S.excavation_amount // Used commonly below
@@ -470,6 +470,9 @@ var/list/mining_overlay_cache = list()
wreckfinds(S.destroy_artefacts)
to_chat(user, "<span class='notice'>You smash through \the [src][fail_message].</span>")
//CHOMPEdit start - Moved the maul sounds up here and made it not cost energy to mine
user.visible_message("<span class='warning'>\The [src] discharges with a thunderous, hair-raising crackle!</span>")
playsound(src, 'sound/weapons/resonator_blast.ogg', 100, 1, -1)
if(newDepth >= 200) // This means the rock is mined out fully
if(S.destroy_artefacts)
@@ -488,12 +491,7 @@ var/list/mining_overlay_cache = list()
var/obj/item/weapon/ore/O = new(src)
geologic_data.UpdateNearbyArtifactInfo(src)
O.geologic_data = geologic_data
user.visible_message("<span class='warning'>\The [src] discharges with a thunderous, hair-raising crackle!</span>")
playsound(src, 'sound/weapons/resonator_blast.ogg', 100, 1, -1)
S.deductcharge()
S.status = 0
S.update_held_icon()
//CHOMPEdit end
if (istype(W, /obj/item/weapon/pickaxe))
if(!istype(user.loc, /turf))