Skip to content

Commit

Permalink
TGS Test Merge (#5480)
Browse files Browse the repository at this point in the history
  • Loading branch information
cm13-github committed Apr 3, 2024
2 parents 1afd796 + 667483a commit 5e13460
Show file tree
Hide file tree
Showing 7 changed files with 103,167 additions and 0 deletions.
4 changes: 4 additions & 0 deletions code/datums/vehicles.dm
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@
name = "Fancy Locker"
interior_id = "fancylocker"

/datum/map_template/interior/fancy_insanity
name = "Fancy Insanity"
interior_id = "fancyinsanity"

/datum/map_template/interior/tank
name = "Tank"
interior_id = "tank"
Expand Down
8 changes: 8 additions & 0 deletions code/modules/mob/dead/observer/orbit.dm
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
/datum/orbit_menu/ui_static_data(mob/user)
var/list/data = list()

var/list/boxers = list()
var/list/humans = list()
var/list/marines = list()
var/list/survivors = list()
Expand Down Expand Up @@ -106,6 +107,8 @@

if(M.ckey == null)
npcs += list(serialized)
if(istype(get_area(M), /area/corsat))
boxers += list(serialized)
continue

if(isliving(M))
Expand All @@ -119,6 +122,8 @@
serialized["caste"] = caste.caste_type
serialized["icon"] = caste.minimap_icon
xenos += list(serialized)
if(istype(get_area(player), /area/corsat))
boxers += list(serialized)
continue

if(ishuman(player))
Expand All @@ -139,6 +144,8 @@
else
serialized["background_color"] = human.assigned_equipment_preset?.minimap_background

if(istype(get_area(human), /area/corsat))
boxers += list(serialized)
if(SSticker.mode.is_in_endgame == TRUE && !is_mainship_level(M.z) && !(human.faction in FACTION_LIST_ERT))
escaped += list(serialized)
else if(human.faction in FACTION_LIST_WY)
Expand Down Expand Up @@ -175,6 +182,7 @@
if(isanimal(player))
animals += list(serialized)

data["boxers"] = boxers
data["humans"] = humans
data["marines"] = marines
data["survivors"] = survivors
Expand Down
3 changes: 3 additions & 0 deletions code/modules/vehicles/interior/areas.dm
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,6 @@

/area/interior/fancylocker
name = "closet interior"

/area/interior/fancylocker/insane
name = "the impossible box"
62 changes: 62 additions & 0 deletions code/modules/vehicles/interior/objects/fancy_locker.dm
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@
/obj/structure/closet/fancy/ex_act(severity)
return

/obj/structure/closet/fancy/bullet_act(obj/projectile/Proj)
return TRUE

/obj/structure/interior_exit/fancy
name = "fancy wooden door"
icon = 'icons/obj/structures/doors/mineral_doors.dmi'
Expand Down Expand Up @@ -75,3 +78,62 @@
if(istype(possible_closet))
return possible_closet
return

/obj/structure/closet/fancy/insane
name = "impossible box"
desc = "<span class='red'>You cannot comprehend the depths...</span>"

interior_map = /datum/map_template/interior/fancy_insanity
passengers_slots = 70
revivable_dead_slots = 25
xenos_slots = 50

icon = 'icons/obj/structures/crates.dmi'
icon_state = "closed_plastic"
icon_closed = "closed_plastic"
icon_opened = "open_plastic"

open_sound = 'sound/effects/ghost.ogg'
close_sound = 'sound/effects/ghost2.ogg'

/obj/structure/closet/fancy/insane/store_mobs(stored_units)
for(var/mob/M in loc)
var/entry_num = rand(1,5)
var/succ = interior.enter(M, "insanity[entry_num]")
if(!succ)
break

/obj/structure/closet/fancy/insane/verb/verb_climbinto()
set src in oview(1)
set category = "Object"
set name = "Climb Into"

var/mob/user = usr

var/entry_num = rand(1,5)
if(isobserver(user))
interior.enter(user, "insanity[entry_num]")
return TRUE

if(user.is_mob_incapacitated())
return FALSE
if(!ishuman(user) && !isxeno(user))
return FALSE

if(!opened)
to_chat(user, SPAN_WARNING("You cannot climb into [src] while it's closed!"))
return FALSE

user.visible_message(SPAN_NOTICE("[user] begins climbing into [src]."), SPAN_NOTICE("You begin climbing into [src]."))
if(!do_after(user, 4 SECONDS, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_HOSTILE, src, INTERRUPT_OUT_OF_RANGE))
user.visible_message(SPAN_NOTICE("[user] stops climbing into [src]."), SPAN_NOTICE("You stop climbing into [src]."))
return FALSE
interior.enter(user, "insanity[entry_num]")
return TRUE

/obj/structure/interior_exit/fancy/ladder
name = "very long ladder"
icon = 'icons/obj/structures/structures.dmi'
icon_state = "ladder10"
density = FALSE
layer = LADDER_LAYER
Loading

0 comments on commit 5e13460

Please sign in to comment.