cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-24 20:47:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15244 from Heroman3003/emagstack

Browse Source 
Fixes emag modules stacking
This commit is contained in:
Heroman3003
2023-08-13 14:29:01 +10:00
committed by GitHub
parent 10391d7496 13550126eb
commit 9b1dec835d
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/_onclick/hud/robot.dm
+6 -4
View File
@@ -249,11 +249,13 @@ var/obj/screen/robot_inventory
//be emagged before they actually select a module. - or some situation can cause them to get a new module
// - or some situation might cause them to get de-emagged or something.
if(r.emagged || r.emag_items)
if(!(r.module.emag in r.module.modules))
r.module.modules.Add(r.module.emag)
for(var/obj/O in r.module.emag)
if(!(O in r.module.modules))
r.module.modules.Add(r.module.emag)
else
if(r.module.emag in r.module.modules)
r.module.modules.Remove(r.module.emag)
for(var/obj/O in r.module.emag)
if(O in r.module.modules)
r.module.modules.Remove(r.module.emag)
for(var/atom/movable/A in r.module.modules)
if( (A != r.module_state_1) && (A != r.module_state_2) && (A != r.module_state_3) )
code/modules/mob/living/silicon/robot/subtypes/thinktank/thinktank_module.dm
+2 -2
View File
@@ -67,7 +67,7 @@
var/obj/item/weapon/gun/energy/phasegun/mounted/cyborg/phasegun = new(src)
modules += phasegun
emag = new /obj/item/weapon/chainsaw(src)
emag += new /obj/item/weapon/chainsaw(src)
/obj/item/weapon/robot_module/robot/platform/explorer/respawn_consumable(var/mob/living/silicon/robot/R, rate)
. = ..()
@@ -93,7 +93,7 @@
modules += new /obj/item/weapon/packageWrap(src)
modules += new /obj/item/weapon/pen/multi(src)
modules += new /obj/item/device/destTagger(src)
emag = new /obj/item/weapon/stamp/denied
emag += new /obj/item/weapon/stamp/denied
/obj/item/weapon/robot_module/robot/platform/cargo/respawn_consumable(mob/living/silicon/robot/R, rate)
. = ..()