cyberpresidentvanellope/Sandstorm-Station-13
1
0
Fork 0
mirror of https://github.com/Sandstorm-Station/Sandstorm-Station-13.git synced 2026-08-24 21:58:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master

Browse Source
This commit is contained in:
Enric Gabriel
2020-07-29 09:52:32 -03:00
parent c9723573cd f8f29826f5
commit 935901593b
395 changed files with 1662 additions and 1307 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/integrated_electronics/core/assemblies.dm
+2 -1
View File
@@ -722,6 +722,7 @@
/obj/item/electronic_assembly/attack_self(mob/user)
set waitfor = FALSE
if(!check_interactivity(user))
return
if(opened)
@@ -814,7 +815,7 @@
return
..()
/obj/item/electronic_assembly/attack_hand(mob/user, act_intent = user.a_intent, unarmed_attack_flags)
/obj/item/electronic_assembly/on_attack_hand(mob/user, act_intent = user.a_intent, unarmed_attack_flags)
if(anchored)
attack_self(user)
return
code/modules/integrated_electronics/subtypes/weaponized.dm
+3
View File
@@ -45,6 +45,9 @@
/obj/item/integrated_circuit/weaponized/weapon_firing/attackby(var/obj/O, var/mob/user)
if(istype(O, /obj/item/gun/energy))
var/obj/item/gun/gun = O
if(!gun.can_circuit)
to_chat(user, "<span class='warning'>[gun] does not fit into circuits.</span>")
return
if(installed_gun)
to_chat(user, "<span class='warning'>There's already a weapon installed.</span>")
return