mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-23 03:57:48 +01:00
whitelist updates (#19288)
* whitelist updates * migrate things to module * . * some more * robot IDs are now handled by module * special ids * . * . * . * . * . * . * move that * . * initial * admin whitelist TGUI * . * . * lol
This commit is contained in:
@@ -114,7 +114,7 @@
|
||||
var/circuit = /obj/item/circuitboard/geiger
|
||||
var/number = 0
|
||||
var/last_tick //used to delay the powercheck
|
||||
var/wiresexposed = 0
|
||||
var/wiresexposed = FALSE
|
||||
mounted = TRUE
|
||||
|
||||
/obj/item/geiger/wall/Initialize(mapload)
|
||||
|
||||
@@ -271,20 +271,18 @@
|
||||
return
|
||||
return
|
||||
|
||||
/obj/item/card/id/cargo/miner/borg
|
||||
/obj/item/card/id/synthetic/borg
|
||||
var/mob/living/silicon/robot/R
|
||||
var/last_robot_loc
|
||||
name = "Robot Miner ID"
|
||||
rank = JOB_SHAFT_MINER
|
||||
|
||||
/obj/item/card/id/cargo/miner/borg/Initialize(mapload)
|
||||
/obj/item/card/id/synthetic/borg/Initialize(mapload)
|
||||
. = ..()
|
||||
if(isrobot(loc?.loc))
|
||||
R = loc.loc
|
||||
registered_name = R.braintype
|
||||
RegisterSignal(src, COMSIG_MOVABLE_ATTEMPTED_MOVE, PROC_REF(check_loc))
|
||||
|
||||
/obj/item/card/id/cargo/miner/borg/proc/check_loc(atom/movable/mover, atom/old_loc, atom/new_loc)
|
||||
/obj/item/card/id/synthetic/borg/proc/check_loc(atom/movable/mover, atom/old_loc, atom/new_loc)
|
||||
SIGNAL_HANDLER
|
||||
if(old_loc == R || old_loc == R.module)
|
||||
last_robot_loc = old_loc
|
||||
@@ -297,7 +295,7 @@
|
||||
if(loc == R)
|
||||
hud_layerise()
|
||||
|
||||
/obj/item/card/id/cargo/miner/borg/Destroy()
|
||||
/obj/item/card/id/synthetic/borg/Destroy()
|
||||
if(R)
|
||||
UnregisterSignal(src, COMSIG_MOVABLE_ATTEMPTED_MOVE)
|
||||
R = null
|
||||
|
||||
@@ -295,39 +295,6 @@
|
||||
initial_sprite_stack = list("base-stamp-silver", "top-olive", "stamp-n", "pips-white")
|
||||
rank = JOB_PATHFINDER
|
||||
|
||||
/obj/item/card/id/exploration/borg
|
||||
var/mob/living/silicon/robot/R
|
||||
var/last_robot_loc
|
||||
name = "Robot Exploration ID"
|
||||
rank = JOB_EXPLORER
|
||||
|
||||
/obj/item/card/id/exploration/borg/Initialize(mapload)
|
||||
. = ..()
|
||||
if(isrobot(loc?.loc))
|
||||
R = loc.loc
|
||||
registered_name = R.braintype
|
||||
RegisterSignal(src, COMSIG_MOVABLE_ATTEMPTED_MOVE, PROC_REF(check_loc))
|
||||
|
||||
/obj/item/card/id/exploration/borg/proc/check_loc(atom/movable/mover, atom/old_loc, atom/new_loc)
|
||||
SIGNAL_HANDLER
|
||||
if(old_loc == R || old_loc == R.module)
|
||||
last_robot_loc = old_loc
|
||||
if(!istype(loc, /obj/machinery) && loc != R && loc != R.module)
|
||||
if(last_robot_loc)
|
||||
forceMove(last_robot_loc)
|
||||
last_robot_loc = null
|
||||
else
|
||||
forceMove(R)
|
||||
if(loc == R)
|
||||
hud_layerise()
|
||||
|
||||
/obj/item/card/id/exploration/borg/Destroy()
|
||||
if(R)
|
||||
UnregisterSignal(src, COMSIG_MOVABLE_ATTEMPTED_MOVE)
|
||||
R = null
|
||||
last_robot_loc = null
|
||||
. = ..()
|
||||
|
||||
//Talon
|
||||
|
||||
/obj/item/card/id/talon
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
/obj/structure/ghost_pod/manual/lost_drone/create_occupant(var/mob/M)
|
||||
density = FALSE
|
||||
var/mob/living/silicon/robot/lost/randomlaws/R = new(get_turf(src))
|
||||
var/mob/living/silicon/robot/malf/lost/randomlaws/R = new(get_turf(src))
|
||||
R.adjustBruteLoss(rand(5, 30))
|
||||
R.adjustFireLoss(rand(5, 10))
|
||||
if(M.mind)
|
||||
@@ -47,7 +47,7 @@
|
||||
|
||||
/obj/structure/ghost_pod/automatic/gravekeeper_drone/create_occupant(var/mob/M)
|
||||
density = FALSE
|
||||
var/mob/living/silicon/robot/gravekeeper/R = new(get_turf(src))
|
||||
var/mob/living/silicon/robot/malf/gravekeeper/R = new(get_turf(src))
|
||||
if(M.mind)
|
||||
M.mind.transfer_to(R)
|
||||
// Put this text here before ckey change so that their laws are shown below it, since borg login() shows it.
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
return ..()
|
||||
else
|
||||
density = FALSE
|
||||
var/mob/living/silicon/robot/lost/randomlaws/vore/R = new(get_turf(src))
|
||||
var/mob/living/silicon/robot/malf/lost/randomlaws/vore/R = new(get_turf(src))
|
||||
R.adjustBruteLoss(rand(5, 30))
|
||||
R.adjustFireLoss(rand(5, 10))
|
||||
if(M.mind)
|
||||
|
||||
Reference in New Issue
Block a user