shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[MIRROR] Cleaned up some emag_acts (#2018)

Browse Source 
* Cleaned up some emag_acts

* Delete port_gen.dm.rej

* Update port_gen.dm
This commit is contained in:
CitadelStationBot
2017-07-15 15:17:56 -05:00
committed by kevinz000
parent 099b908d64
commit d21766956e
40 changed files with 200 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/cargo/console.dm
+11 -10
View File
@@ -24,18 +24,19 @@
contraband = board.contraband
emagged = board.emagged
/obj/machinery/computer/cargo/emag_act(mob/living/user)
if(!emagged)
user.visible_message("<span class='warning'>[user] swipes a suspicious card through [src]!",
"<span class='notice'>You adjust [src]'s routing and receiver spectrum, unlocking special supplies and contraband.</span>")
/obj/machinery/computer/cargo/emag_act(mob/user)
if(emagged)
return
user.visible_message("<span class='warning'>[user] swipes a suspicious card through [src]!",
"<span class='notice'>You adjust [src]'s routing and receiver spectrum, unlocking special supplies and contraband.</span>")
emagged = TRUE
contraband = TRUE
emagged = TRUE
contraband = TRUE
// This also permamently sets this on the circuit board
var/obj/item/weapon/circuitboard/computer/cargo/board = circuit
board.contraband = TRUE
board.emagged = TRUE
// This also permamently sets this on the circuit board
var/obj/item/weapon/circuitboard/computer/cargo/board = circuit
board.contraband = TRUE
board.emagged = TRUE
/obj/machinery/computer/cargo/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)