diff --git a/code/WorkInProgress/Cael_Aislinn/sculpture.dm b/code/WorkInProgress/Cael_Aislinn/sculpture.dm index 2ecc98a4aec..639c2c84877 100644 --- a/code/WorkInProgress/Cael_Aislinn/sculpture.dm +++ b/code/WorkInProgress/Cael_Aislinn/sculpture.dm @@ -26,7 +26,6 @@ G.assailant = src G.layer = 20 G.affecting = target - target.grabbed_by += G G.synch() target.LAssailant = src diff --git a/code/WorkInProgress/Cib/amorph/amorph_attack.dm b/code/WorkInProgress/Cib/amorph/amorph_attack.dm index 188c682033d..814b977d1ab 100644 --- a/code/WorkInProgress/Cib/amorph/amorph_attack.dm +++ b/code/WorkInProgress/Cib/amorph/amorph_attack.dm @@ -95,7 +95,6 @@ M.r_hand = G G.layer = 20 G.affecting = src - grabbed_by += G G.synch() LAssailant = M @@ -150,7 +149,6 @@ M.r_hand = G G.layer = 20 G.affecting = src - grabbed_by += G G.synch() LAssailant = M diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index 00d59978143..5baa9189111 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -311,6 +311,9 @@ M:reagents.add_reagent("inaprovaline", 5) return proc/toggle_filter() + if(!src.occupant) + filtering = 0 + return if(filtering) filtering = 0 else diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm index b40f511a3bf..9341aca674f 100644 --- a/code/game/machinery/computer/card.dm +++ b/code/game/machinery/computer/card.dm @@ -11,24 +11,24 @@ var/mode = 0.0 var/printing = null - proc/is_centcom() - return istype(src, /obj/machinery/computer/card/centcom) +/obj/machinery/computer/card/proc/is_centcom() + return 0 - proc/is_authenticated() - return scan ? check_access(scan) : 0 +/obj/machinery/computer/card/proc/is_authenticated() + return scan ? check_access(scan) : 0 - proc/get_target_rank() - return modify && modify.assignment ? modify.assignment : "Unassigned" +/obj/machinery/computer/card/proc/get_target_rank() + return modify && modify.assignment ? modify.assignment : "Unassigned" - proc/format_jobs(list/jobs) - var/list/formatted = list() - for(var/job in jobs) - formatted.Add(list(list( - "display_name" = replacetext(job, " ", " "), - "target_rank" = get_target_rank(), - "job" = job))) +/obj/machinery/computer/card/proc/format_jobs(list/jobs) + var/list/formatted = list() + for(var/job in jobs) + formatted.Add(list(list( + "display_name" = replacetext(job, " ", " "), + "target_rank" = get_target_rank(), + "job" = job))) - return formatted + return formatted /obj/machinery/computer/card/verb/eject_id() set category = "Object" @@ -288,3 +288,7 @@ name = "CentCom Identification Computer" circuit = "/obj/item/weapon/circuitboard/card/centcom" req_access = list(access_cent_captain) + + +/obj/machinery/computer/card/centcom/is_centcom() + return 1 diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm index e38827b1a05..cbc9fb80a5f 100644 --- a/code/modules/client/client procs.dm +++ b/code/modules/client/client procs.dm @@ -159,6 +159,7 @@ log_client_to_db() send_resources() + nanomanager.send_resources(src) if(prefs.lastchangelog != changelog_hash) //bolds the changelog button on the interface so we know there are updates. winset(src, "rpane.changelog", "background-color=#eaeaea;font-style=bold") diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm index 46e70c06acb..b8030886c3d 100644 --- a/code/modules/mob/living/carbon/human/human_attackhand.dm +++ b/code/modules/mob/living/carbon/human/human_attackhand.dm @@ -102,7 +102,6 @@ if(!G) //the grab will delete itself in New if affecting is anchored return M.put_in_active_hand(G) - grabbed_by += G G.synch() LAssailant = M diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm index 6178cddf3c8..27883d145ec 100644 --- a/code/modules/mob/living/carbon/human/inventory.dm +++ b/code/modules/mob/living/carbon/human/inventory.dm @@ -687,6 +687,7 @@ It can still be worn/put on as normal. for (var/obj/item/weapon/grab/G in target.grabbed_by) if (G.loc == source && G.state >= GRAB_AGGRESSIVE) grabbing = 1 + break if (!grabbing) slot_to_process = null source << "\red Your grasp was broken before you could restrain [target]!" diff --git a/code/modules/mob/living/carbon/monkey/monkey.dm b/code/modules/mob/living/carbon/monkey/monkey.dm index 678eeccd6cd..22dbfcb0aea 100644 --- a/code/modules/mob/living/carbon/monkey/monkey.dm +++ b/code/modules/mob/living/carbon/monkey/monkey.dm @@ -231,7 +231,6 @@ M.put_in_active_hand(G) - grabbed_by += G G.synch() LAssailant = M diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index a6d6f02d391..838f102ff99 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -861,6 +861,8 @@ var/list/robot_verbs_default = list( spark_system.start() return ..() + + /mob/living/silicon/robot/attack_slime(mob/living/carbon/slime/M as mob) if (!ticker) M << "You cannot attack people before the game has started." diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index b9e6e714dd5..e06d1af9381 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -250,7 +250,6 @@ M.put_in_active_hand(G) - grabbed_by += G G.synch() G.affecting = src LAssailant = M @@ -267,6 +266,7 @@ return + /mob/living/simple_animal/attack_slime(mob/living/carbon/slime/M as mob) if (!ticker) M << "You cannot attack people before the game has started." diff --git a/code/modules/mob/login.dm b/code/modules/mob/login.dm index 4b9d28402cd..45fb2cc1075 100644 --- a/code/modules/mob/login.dm +++ b/code/modules/mob/login.dm @@ -45,4 +45,4 @@ client.eye = src client.perspective = MOB_PERSPECTIVE - nanomanager.send_resources(client) + nanomanager.send_resources(client) \ No newline at end of file diff --git a/code/modules/mob/mob_grab.dm b/code/modules/mob/mob_grab.dm index ad8915f5e34..d6e6496f9da 100644 --- a/code/modules/mob/mob_grab.dm +++ b/code/modules/mob/mob_grab.dm @@ -28,6 +28,8 @@ del(src) return + affecting.grabbed_by += src + hud = new /obj/screen/grab(src) hud.icon_state = "reinforce" hud.name = "reinforce grab" diff --git a/code/unused/hivebot/hivebot.dm b/code/unused/hivebot/hivebot.dm index cf764c088b4..ade7dab091a 100644 --- a/code/unused/hivebot/hivebot.dm +++ b/code/unused/hivebot/hivebot.dm @@ -207,7 +207,6 @@ M.r_hand = G G.layer = 20 G.affecting = src - src.grabbed_by += G G.synch() playsound(src.loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) for(var/mob/O in viewers(src, null)) diff --git a/nano/templates/accounts_terminal.tmpl b/nano/templates/accounts_terminal.tmpl index ca7fe82752e..e70561c9986 100644 --- a/nano/templates/accounts_terminal.tmpl +++ b/nano/templates/accounts_terminal.tmpl @@ -80,7 +80,7 @@ Balance:
- ${{:helper.formatNumber(money)}} + ${{:helper.formatNumber(data.money)}}
diff --git a/nano/templates/escape_shuttle_control_console.tmpl b/nano/templates/escape_shuttle_control_console.tmpl index 968860c0ff5..8fdb6b4cc5b 100644 --- a/nano/templates/escape_shuttle_control_console.tmpl +++ b/nano/templates/escape_shuttle_control_console.tmpl @@ -65,7 +65,7 @@
{{for data.auth_list}} {{if value.auth_hash}} - {{:helper.link(auth_name, 'eject', {'removeid' : value.auth_hash}, null, 'itemContentWide')}} + {{:helper.link(value.auth_name, 'eject', {'removeid' : value.auth_hash}, null, 'itemContentWide')}} {{else}} {{:helper.link("", 'eject', {'scanid' : 1}, null, 'itemContentWide')}} {{/if}} diff --git a/nano/templates/identification_computer.tmpl b/nano/templates/identification_computer.tmpl index d7635dc9f70..e783d9e3af4 100644 --- a/nano/templates/identification_computer.tmpl +++ b/nano/templates/identification_computer.tmpl @@ -209,7 +209,7 @@
{{for data.all_centcom_access}}
- {{:helper.link(value.desc, '', {'choice' : 'access', 'access_target' : value.ref, 'allowed' : allowed}, null, value.allowed ? 'selected' : null)}} + {{:helper.link(value.desc, '', {'choice' : 'access', 'access_target' : value.ref, 'allowed' : value.allowed}, null, value.allowed ? 'selected' : null)}}
{{/for}}