shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #8822 from Ghommie/Ghommie-cit107

Browse Source 
[s] ports "Fixes infinite brass generation exploit"
This commit is contained in:
deathride58
2019-07-08 17:43:59 -04:00
committed by GitHub
parent 19662494b6 98418c7f87
commit 33ed7cf72c
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/turfs/simulated/floor/misc_floor.dm
+13 -2
View File
@@ -144,6 +144,7 @@
barefootstep = FOOTSTEP_HARD_BAREFOOT barefootstep = FOOTSTEP_HARD_BAREFOOT
clawfootstep = FOOTSTEP_HARD_CLAW clawfootstep = FOOTSTEP_HARD_CLAW
heavyfootstep = FOOTSTEP_GENERIC_HEAVY heavyfootstep = FOOTSTEP_GENERIC_HEAVY
var/dropped_brass
var/uses_overlay = TRUE var/uses_overlay = TRUE
var/obj/effect/clockwork/overlay/floor/realappearence var/obj/effect/clockwork/overlay/floor/realappearence
@@ -201,7 +202,10 @@
return return
/turf/open/floor/clockwork/crowbar_act(mob/living/user, obj/item/I) /turf/open/floor/clockwork/crowbar_act(mob/living/user, obj/item/I)
if(baseturfs == type) if(islist(baseturfs))
if(type in baseturfs)
return TRUE
else if(baseturfs == type)
return TRUE return TRUE
user.visible_message("<span class='notice'>[user] begins slowly prying up [src]...</span>", "<span class='notice'>You begin painstakingly prying up [src]...</span>") user.visible_message("<span class='notice'>[user] begins slowly prying up [src]...</span>", "<span class='notice'>You begin painstakingly prying up [src]...</span>")
if(I.use_tool(src, user, 70, volume=80)) if(I.use_tool(src, user, 70, volume=80))
@@ -210,7 +214,14 @@
return TRUE return TRUE
/turf/open/floor/clockwork/make_plating() /turf/open/floor/clockwork/make_plating()
new /obj/item/stack/tile/brass(src) if(!dropped_brass)
new /obj/item/stack/tile/brass(src)
dropped_brass = TRUE
if(islist(baseturfs))
if(type in baseturfs)
return
else if(baseturfs == type)
return
return ..() return ..()
/turf/open/floor/clockwork/narsie_act() /turf/open/floor/clockwork/narsie_act()