[MIRROR] Does some code standardization/consistency. (#3161)
* Does some code standardization/consistency. * fixes merge conflict generation * Missed a few, oops * Update pierrot_throat.dm
This commit is contained in:
committed by
Poojawa
parent
953a353ce7
commit
adc2e46114
@@ -311,7 +311,8 @@
|
||||
to_chat(user, "<span class='notice'>You start slicing the disposal pipe...</span>")
|
||||
// check if anything changed over 2 seconds
|
||||
if(do_after(user,30, target = src))
|
||||
if(!src || !W.isOn()) return
|
||||
if(!src || !W.isOn())
|
||||
return
|
||||
deconstruct()
|
||||
to_chat(user, "<span class='notice'>You slice the disposal pipe.</span>")
|
||||
else
|
||||
@@ -709,7 +710,8 @@
|
||||
playsound(src.loc, 'sound/items/welder2.ogg', 100, 1)
|
||||
to_chat(user, "<span class='notice'>You start slicing the floorweld off \the [src]...</span>")
|
||||
if(do_after(user,20*I.toolspeed, target = src))
|
||||
if(!src || !W.isOn()) return
|
||||
if(!src || !W.isOn())
|
||||
return
|
||||
to_chat(user, "<span class='notice'>You slice the floorweld off \the [src].</span>")
|
||||
stored.loc = loc
|
||||
src.transfer_fingerprints_to(stored)
|
||||
|
||||
@@ -468,13 +468,17 @@
|
||||
return
|
||||
switch(dir)
|
||||
if(NORTH)
|
||||
if(AM.loc.y != loc.y+1) return
|
||||
if(AM.loc.y != loc.y+1)
|
||||
return
|
||||
if(EAST)
|
||||
if(AM.loc.x != loc.x+1) return
|
||||
if(AM.loc.x != loc.x+1)
|
||||
return
|
||||
if(SOUTH)
|
||||
if(AM.loc.y != loc.y-1) return
|
||||
if(AM.loc.y != loc.y-1)
|
||||
return
|
||||
if(WEST)
|
||||
if(AM.loc.x != loc.x-1) return
|
||||
if(AM.loc.x != loc.x-1)
|
||||
return
|
||||
|
||||
if(isobj(AM))
|
||||
var/obj/O = AM
|
||||
|
||||
Reference in New Issue
Block a user