mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-07-16 09:34:52 +01:00
Better borg modules (#17507)
* Combines all the engineering borg tools into one multitool Sprites from /tg/ Combines: Wirecutters, Crowbar, Welder, Wrench, Crowbar, Screwdriver * this is a WAY better way to do it * a * dont worry about overlays anymore * Better grippers and better lists In which I go insane having to continually patch exploit after exploit in gripper code, resulting in it looking like a mad man's scribbles. * No deleting shoes when putting them on someone * empty pocket is now empty * RENAMING stuff instead of copypaste * MORE borg stuff * more bugproofing * Admin proc * this * this * Framework for TGUI * Update robot_simple_items.dm * Fix * Framework v2 * Update ModifyRobotMultiBelt.tsx * goooo * Update modify_robot.dm * modify * sub category * . * string to define * some globs * more * . * . * . * add sanely * push that real quick * . * sanity * . * . * . * . * . * . * . * Cut * . * gives to those that need * push * clean up * auto fix * . * . * . * getmodule * Update robot_simple_items.dm * . * untyped * Update stack.dm * . * . * . * . * - * . * Update _map_selection.dm * Update _map_selection.dm --------- Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
@@ -37,7 +37,7 @@
|
||||
if(!AMBLINAL.mind)
|
||||
AMBLINAL.ghostjoin = 1
|
||||
AMBLINAL.ghostjoin_icon()
|
||||
active_ghost_pods |= AMBLINAL
|
||||
GLOB.active_ghost_pods |= AMBLINAL
|
||||
//VOREStation Add End
|
||||
user.visible_message(span_notice("[user] pries \the [src] open."), \
|
||||
span_notice("You pry open \the [src]."), \
|
||||
|
||||
@@ -252,7 +252,7 @@
|
||||
if(istype(W,/obj/item/grab || /obj/item/holder))
|
||||
gargoyle.vore_attackby(W, user)
|
||||
return
|
||||
if(gargoyle.adminbus_trash || is_type_in_list(W,edible_trash) && W.trash_eatable && !is_type_in_list(W,item_vore_blacklist))
|
||||
if(gargoyle.adminbus_trash || is_type_in_list(W, GLOB.edible_trash) && W.trash_eatable && !is_type_in_list(W, GLOB.item_vore_blacklist))
|
||||
to_chat(user, span_warning("You slip [W] into [gargoyle]'s [lowertext(gargoyle.vore_selected.name)] ."))
|
||||
user.drop_item()
|
||||
W.forceMove(gargoyle.vore_selected)
|
||||
@@ -276,7 +276,7 @@
|
||||
/obj/structure/gargoyle/hitby(atom/movable/AM as mob|obj,var/speed = THROWFORCE_SPEED_DIVISOR)
|
||||
if(istype(AM,/obj/item) && gargoyle && gargoyle.vore_selected && gargoyle.trash_catching)
|
||||
var/obj/item/I = AM
|
||||
if(gargoyle.adminbus_trash || is_type_in_list(I,edible_trash) && I.trash_eatable && !is_type_in_list(I,item_vore_blacklist))
|
||||
if(gargoyle.adminbus_trash || is_type_in_list(I, GLOB.edible_trash) && I.trash_eatable && !is_type_in_list(I, GLOB.item_vore_blacklist))
|
||||
gargoyle.hitby(AM, speed)
|
||||
return
|
||||
else if(isliving(AM) && gargoyle)
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/obj/structure/ghost_pod/proc/reset_ghostpod() //Makes the ghost pod usable again and re-adds it to the active ghost pod list if it is not on it.
|
||||
active_ghost_pods |= src
|
||||
GLOB.active_ghost_pods |= src
|
||||
used = FALSE
|
||||
busy = FALSE
|
||||
|
||||
@@ -174,8 +174,7 @@
|
||||
|
||||
/obj/structure/ghost_pod/ghost_activated/maintpred/redgate/Initialize(mapload)
|
||||
. = ..()
|
||||
if(!(src in active_ghost_pods))
|
||||
active_ghost_pods += src
|
||||
GLOB.active_ghost_pods += src
|
||||
|
||||
/obj/structure/ghost_pod/ghost_activated/maint_lurker
|
||||
name = "strange maintenance hole"
|
||||
@@ -260,8 +259,7 @@
|
||||
|
||||
/obj/structure/ghost_pod/ghost_activated/maint_lurker/Initialize(mapload)
|
||||
. = ..()
|
||||
if(!(src in active_ghost_pods))
|
||||
active_ghost_pods += src
|
||||
GLOB.active_ghost_pods += src
|
||||
|
||||
/// redspace variant
|
||||
|
||||
|
||||
@@ -51,10 +51,7 @@
|
||||
// Override this to create whatever mob you need. Be sure to call ..() if you don't want it to make infinite mobs.
|
||||
/obj/structure/ghost_pod/proc/create_occupant(var/mob/M)
|
||||
used = TRUE
|
||||
//VOREStation Addition Start
|
||||
if(src in active_ghost_pods)
|
||||
active_ghost_pods -= src
|
||||
//VOREStation Addition End
|
||||
GLOB.active_ghost_pods -= src
|
||||
return TRUE
|
||||
|
||||
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
/obj/structure/ghost_pod/Destroy()
|
||||
if(src in active_ghost_pods)
|
||||
active_ghost_pods -= src
|
||||
..()
|
||||
GLOB.active_ghost_pods -= src
|
||||
. = ..()
|
||||
|
||||
/obj/structure/ghost_pod
|
||||
var/spawn_active = FALSE
|
||||
@@ -47,8 +46,7 @@
|
||||
create_occupant(user)
|
||||
|
||||
/obj/structure/ghost_pod/proc/ghostpod_startup(var/notify = FALSE)
|
||||
if(!(src in active_ghost_pods))
|
||||
active_ghost_pods += src
|
||||
GLOB.active_ghost_pods |= src
|
||||
if(notify)
|
||||
trigger()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user