mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 10:43:20 +00:00
[MIRROR] Linter diagnostics + bans non-var relative pathing
This commit is contained in:
@@ -55,7 +55,13 @@
|
||||
charge_cost = 400
|
||||
recharge_time = 7
|
||||
|
||||
<<<<<<< HEAD
|
||||
obj/item/weapon/gun/energy/locked/phasegun/rifle
|
||||
||||||| parent of 18962f7a77... Merge pull request #10719 from VOREStation/upstream-merge-8150
|
||||
obj/item/weapon/gun/energy/phasegun/rifle
|
||||
=======
|
||||
/obj/item/weapon/gun/energy/phasegun/rifle
|
||||
>>>>>>> 18962f7a77... Merge pull request #10719 from VOREStation/upstream-merge-8150
|
||||
name = "phase rifle"
|
||||
desc = "The RayZar EW31 Orion is a specialist energy weapon, intended for use against hostile wildlife. This one has a safety interlock that prevents firing while in proximity to the facility."
|
||||
icon_state = "phaserifle"
|
||||
|
||||
@@ -162,7 +162,7 @@
|
||||
projectile_type = /obj/item/projectile/animate
|
||||
charge_cost = 240
|
||||
*/
|
||||
obj/item/weapon/gun/energy/staff/focus
|
||||
/obj/item/weapon/gun/energy/staff/focus
|
||||
name = "mental focus"
|
||||
desc = "An artifact that channels the will of the user into destructive bolts of force. If you aren't careful with it, you might poke someone's brain out."
|
||||
icon = 'icons/obj/wizard.dmi'
|
||||
|
||||
@@ -81,7 +81,7 @@
|
||||
max_shells = 7
|
||||
|
||||
|
||||
obj/item/weapon/gun/projectile/revolver/detective45/verb/rename_gun()
|
||||
/obj/item/weapon/gun/projectile/revolver/detective45/verb/rename_gun()
|
||||
set name = "Name Gun"
|
||||
set category = "Object"
|
||||
set desc = "Rename your gun. If you're the Detective."
|
||||
|
||||
@@ -92,7 +92,7 @@
|
||||
STOP_PROCESSING(SSobj, src)
|
||||
return ..()
|
||||
|
||||
obj/aiming_overlay/proc/update_aiming_deferred()
|
||||
/obj/aiming_overlay/proc/update_aiming_deferred()
|
||||
set waitfor = 0
|
||||
sleep(0)
|
||||
update_aiming()
|
||||
|
||||
Reference in New Issue
Block a user