cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 04:27:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Verb cleanup (#22224)

Browse Source 
* Verb cleanup

* rest of the object verbs

* little more object cleanup

* more changes

* last of it

* this too

* tgui

* code review

* time to go
This commit is contained in:
GDN
2023-11-12 20:19:17 +00:00
committed by GitHub
parent f65d120711
commit 35754c77ea
90 changed files with 754 additions and 1609 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/engines/singularity/emitter.dm
+5 -13
View File
@@ -55,6 +55,7 @@
. = ..()
if(panel_open)
. += "<span class='notice'>The maintenance panel is open.</span>"
. += "<span class='info'><b>Alt-Click</b> to rotate [src].</span>"
/obj/machinery/power/emitter/RefreshParts()
var/max_firedelay = 120
@@ -72,24 +73,15 @@
power_usage -= 50 * M.rating
active_power_consumption = power_usage
/obj/machinery/power/emitter/verb/rotate()
set name = "Rotate"
set category = "Object"
set src in oview(1)
/obj/machinery/power/emitter/AltClick(mob/user)
if(user.stat || HAS_TRAIT(user, TRAIT_HANDS_BLOCKED) || !Adjacent(user))
return
if(anchored)
to_chat(usr, "It is fastened to the floor!")
to_chat(user, "<span class='notice'>It is fastened to the floor!</span>")
return
dir = turn(dir, 90)
/obj/machinery/power/emitter/AltClick(mob/user)
if(user.incapacitated())
to_chat(user, "<span class='warning'>You can't do that right now!</span>")
return
if(!Adjacent(user))
return
rotate()
/obj/machinery/power/emitter/Destroy()
msg_admin_attack("Emitter deleted at ([x],[y],[z] - [ADMIN_JMP(src)]) [usr ? "Broken by [key_name_admin(usr)]" : ""]", ATKLOG_FEW)
log_game("Emitter deleted at ([x],[y],[z])")
code/modules/power/engines/singularity/particle_accelerator/particle_accelerator.dm
+12 -53
View File
@@ -87,39 +87,13 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin
icon_state = "end_cap"
reference = "end_cap"
/obj/structure/particle_accelerator/verb/rotate()
set name = "Rotate Clockwise"
set category = "Object"
set src in oview(1)
if(usr.stat || HAS_TRAIT(usr, TRAIT_HANDS_BLOCKED) || usr.restrained())
return
if(anchored)
to_chat(usr, "It is fastened to the floor!")
return 0
dir = turn(dir, 270)
return 1
/obj/structure/particle_accelerator/AltClick(mob/user)
if(user.incapacitated())
to_chat(user, "<span class='warning'>You can't do that right now!</span>")
return
if(!Adjacent(user))
return
rotate()
/obj/structure/particle_accelerator/verb/rotateccw()
set name = "Rotate Counter Clockwise"
set category = "Object"
set src in oview(1)
if(usr.stat || HAS_TRAIT(usr, TRAIT_HANDS_BLOCKED) || usr.restrained())
if(user.stat || HAS_TRAIT(user, TRAIT_HANDS_BLOCKED) || !Adjacent(user))
return
if(anchored)
to_chat(usr, "It is fastened to the floor!")
return 0
dir = turn(dir, 90)
return 1
to_chat(user, "<span class='notice'>It is fastened to the floor!</span>")
return
dir = turn(dir, 270)
/obj/structure/particle_accelerator/examine(mob/user)
. = ..()
@@ -135,7 +109,7 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin
if(powered)
desc = desc_holder
if(!anchored)
. += "<span class='notice'>Alt-click to rotate it.</span>"
. += "<span class='notice'><b>Alt-Click</b> to rotate it.</span>"
/obj/structure/particle_accelerator/deconstruct(disassembled = TRUE)
if(!(flags & NODECONSTRUCT))
@@ -260,32 +234,17 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin
var/strength = 0
var/desc_holder = null
/obj/structure/particle_accelerator/examine(mob/user)
. = ..()
. += "<span class='info'><b>Alt-Click</b> to rotate it.</span>"
/obj/machinery/particle_accelerator/verb/rotate()
set name = "Rotate Clockwise"
set category = "Object"
set src in oview(1)
if(usr.stat || HAS_TRAIT(usr, TRAIT_HANDS_BLOCKED) || usr.restrained())
/obj/machinery/particle_accelerator/AltClick(mob/user)
if(user.stat || HAS_TRAIT(user, TRAIT_HANDS_BLOCKED) || !Adjacent(user))
return
if(anchored)
to_chat(usr, "It is fastened to the floor!")
return 0
to_chat(user, "<span class='notice'>It is fastened to the floor!</span>")
return
dir = turn(dir, 270)
return 1
/obj/machinery/particle_accelerator/verb/rotateccw()
set name = "Rotate Counter-Clockwise"
set category = "Object"
set src in oview(1)
if(usr.stat || HAS_TRAIT(usr, TRAIT_HANDS_BLOCKED) || usr.restrained())
return
if(anchored)
to_chat(usr, "It is fastened to the floor!")
return 0
dir = turn(dir, 90)
return 1
/obj/machinery/particle_accelerator/attackby(obj/item/W, mob/user, params)
if(!iscoil(W))