cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-30 08:39:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Better borg modules (#11095)

Browse Source 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-06-20 22:04:56 +02:00
committed by GitHub
co-authored by Cameron Lennox Kashargul
parent 85abe91473
commit f7e20d021e
78 changed files with 1785 additions and 1133 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/largecrate.dm
+1 -1
View File
@@ -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]."), \
code/game/objects/structures/gargoyle.dm
+2 -2
View File
@@ -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)
code/game/objects/structures/ghost_pods/event_vr.dm
+3 -5
View File
@@ -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
@@ -189,8 +189,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"
@@ -275,8 +274,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
code/game/objects/structures/ghost_pods/ghost_pods.dm
+1 -4
View File
@@ -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
code/game/objects/structures/ghost_pods/ghost_pods_vr.dm
+3 -5
View File
@@ -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()