cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-03 05:52:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Misc fixes (#10033)

Browse Source 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-02-01 13:16:55 -07:00
committed by GitHub
parent 3c7249d316
commit 92e9dc63d5
2 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
code/game/machinery/frame.dm
View File

@@ -432,6 +432,12 @@
circuit.construct(B)
circuit.loc = null
B.circuit = circuit
var/obj/machinery/computer/LC = locate() in get_step(B, turn(B.dir, 90))
var/obj/machinery/computer/RC = locate() in get_step(B, turn(B.dir, -90))
if(LC)
LC.update_icon()
if(RC)
RC.update_icon()
qdel(src)
return
@@ -445,15 +451,7 @@
circuit.construct(B)
circuit.loc = null
B.circuit = circuit
B.update_icon()
var/obj/machinery/computer/LC = locate() in get_step(B, turn(B.dir, 90))
var/obj/machinery/computer/RC = locate() in get_step(B, turn(B.dir, -90))
if(LC)
LC.update_icon()
if(RC)
RC.update_icon()
qdel(src)
return

10
code/modules/projectiles/guns/projectile/shotgun_vr.dm
View File

@@ -84,16 +84,6 @@
else
to_chat(usr, span_notice("You cannot do this in your current state."))
/obj/item/gun/projectile/shotgun/compact/attack_self(mob/user)
if(issilicon(user))
return
if (isliving(user))
toggle_stock()
else
to_chat(user, span_notice("You cannot do this in your current state."))
/obj/item/gun/projectile/shotgun/compact/ui_action_click(mob/unused_user, actiontype)
var/mob/living/user = loc
if(!isliving(user))