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

[MIRROR] stop upgrade spam on griders (#9873)

Browse Source 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-01-14 23:45:33 -07:00
committed by GitHub
parent 5eb89e8ef7
commit 45db2f6918
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
code/game/objects/structures/girders.dm
View File

@@ -15,6 +15,7 @@
var/datum/material/girder_material var/datum/material/girder_material
var/datum/material/reinf_material var/datum/material/reinf_material
var/reinforcing = 0 var/reinforcing = 0
var/upgrading = FALSE
var/applies_material_colour = 1 var/applies_material_colour = 1
var/wall_type = /turf/simulated/wall var/wall_type = /turf/simulated/wall
@@ -208,8 +209,13 @@
if(!reinforce_with_material(W, user)) if(!reinforce_with_material(W, user))
return ..() return ..()
else else
if(upgrading)
return
upgrading = TRUE
if(!construct_wall(W, user)) if(!construct_wall(W, user))
upgrading = FALSE
return ..() return ..()
upgrading = FALSE
else else
return ..() return ..()
@@ -226,23 +232,23 @@
var/amount_to_use = reinf_material ? 1 : 2 var/amount_to_use = reinf_material ? 1 : 2
if(S.get_amount() < amount_to_use) if(S.get_amount() < amount_to_use)
to_chat(user, span_notice("There isn't enough material here to construct a wall.")) to_chat(user, span_notice("There isn't enough material here to construct a wall."))
return 0 return FALSE
var/datum/material/M = name_to_material[S.default_type] var/datum/material/M = name_to_material[S.default_type]
if(!istype(M)) if(!istype(M))
return 0 return FALSE
var/wall_fake var/wall_fake
add_hiddenprint(user) add_hiddenprint(user)
if(M.integrity < 50) if(M.integrity < 50)
to_chat(user, span_notice("This material is too soft for use in wall construction.")) to_chat(user, span_notice("This material is too soft for use in wall construction."))
return 0 return FALSE
to_chat(user, span_notice("You begin adding the plating...")) to_chat(user, span_notice("You begin adding the plating..."))
if(!do_after(user,40) || !S.use(amount_to_use)) if(!do_after(user,40) || !S.use(amount_to_use))
return 1 //once we've gotten this far don't call parent attackby() return TRUE //once we've gotten this far don't call parent attackby()
if(anchored) if(anchored)
to_chat(user, span_notice("You added the plating!")) to_chat(user, span_notice("You added the plating!"))
@@ -258,7 +264,7 @@
T.can_open = 1 T.can_open = 1
T.add_hiddenprint(user) T.add_hiddenprint(user)
qdel(src) qdel(src)
return 1 return TRUE
/obj/structure/girder/proc/reinforce_with_material(obj/item/stack/material/S, mob/user) //if the verb is removed this can be renamed. /obj/structure/girder/proc/reinforce_with_material(obj/item/stack/material/S, mob/user) //if the verb is removed this can be renamed.
if(reinf_material) if(reinf_material)