Skip to content

Commit

Permalink
port: supply pods launcher admin button (#6305)
Browse files Browse the repository at this point in the history
* port: supply pods launcher admin button

* fix

* light fix

* Reverce pods fix + map fix

* limb effect fix

* Update tgui.bundle.js

* conflicts fixes

* Update tgui.bundle.js
  • Loading branch information
dageavtobusnick authored Jan 4, 2025
1 parent e0a7853 commit e5d3527
Show file tree
Hide file tree
Showing 74 changed files with 5,576 additions and 834 deletions.
1,959 changes: 1,234 additions & 725 deletions _maps/map_files/generic/CentComm.dmm

Large diffs are not rendered by default.

37 changes: 37 additions & 0 deletions code/__DEFINES/cargo.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
#define STYLE_STANDARD 1
#define STYLE_BLUESPACE 2
#define STYLE_CENTCOM 3
#define STYLE_SYNDICATE 4
#define STYLE_BLUE 5
#define STYLE_CULT 6
#define STYLE_MISSILE 7
#define STYLE_RED_MISSILE 8
#define STYLE_BOX 9
#define STYLE_HONK 10
#define STYLE_FRUIT 11
#define STYLE_INVISIBLE 12
#define STYLE_GONDOLA 13

#define POD_ICON_STATE 1
#define POD_NAME 2
#define POD_DESC 3

#define POD_SHAPE_NORMAL 1
#define POD_SHAPE_OTHER 2

#define RUBBLE_NONE 1
#define RUBBLE_NORMAL 2
#define RUBBLE_WIDE 3
#define RUBBLE_THIN 4

#define POD_TRANSIT "1"
#define POD_FALLING "2"
#define POD_OPENING "3"
#define POD_LEAVING "4"

#define MOB_OPTION "Mobs"
#define UNANCHORED_OPTION "Unanchored"
#define ANCHORED_OPTION "Anchored"
#define MECHA_OPTION "Mecha"

#define SUPPLYPOD_X_OFFSET -16
10 changes: 10 additions & 0 deletions code/__DEFINES/dcs/signals_object.dm
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,13 @@
///from base of [/obj/proc/update_integrity]: (old_value, new_value)
#define COMSIG_OBJ_INTEGRITY_CHANGED "obj_integrity_changed"


///sent to targets during the process_hit proc of projectiles
#define COMSIG_FIRE_CASING "fire_casing"

///called in /obj/item/grenade/proc/prime(): (user)
#define COMSIG_GRENADE_DETONATE "grenade_prime"

///from [/obj/structure/closet/supplypod/proc/preOpen]:
#define COMSIG_SUPPLYPOD_LANDED "supplypodgoboom"

6 changes: 6 additions & 0 deletions code/__DEFINES/is_helpers.dm
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,12 @@

#define isstorage(A) (istype(A, /obj/item/storage))

#define isgrenade(A) (istype(A, /obj/item/grenade))

#define issupplypod(A) (istype(A, /obj/structure/closet/supplypod))

#define isammocasing(A) (istype(A, /obj/item/ammo_casing))

#define ismachinery(A) (istype(A, /obj/machinery))

#define isapc(A) (istype(A, /obj/machinery/power/apc))
Expand Down
3 changes: 3 additions & 0 deletions code/__DEFINES/obj_flags.dm
Original file line number Diff line number Diff line change
Expand Up @@ -75,3 +75,6 @@
/// Checks for finger coverage, prevents damage from nettles
#define FINGERS_COVERED (1<<6)

/// Flags for the pod_flags var on /obj/structure/closet/supplypod
#define FIRST_SOUNDS (1<<0) // If it shouldn't play sounds the first time it lands, used for reverse mode

2 changes: 2 additions & 0 deletions code/__DEFINES/traits/declarations.dm
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,8 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
/// This trait makes it so that an item literally cannot be removed at all, or at least that's how it should be. Only deleted.
#define TRAIT_NODROP "nodrop"

#define TRAIT_SHRAPNEL "shrapnel"


///Movement type traits for movables. See elements/movetype_handler.dm
#define TRAIT_MOVE_GROUND "move_ground"
Expand Down
27 changes: 27 additions & 0 deletions code/__HELPERS/turfs.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
///Returns a random turf on the station
/proc/get_random_station_turf()
var/list/turfs = get_area_turfs(pick(SSmapping.existing_station_areas))
if (length(turfs))
return pick(turfs)

///Returns a random turf on the station, excludes dense turfs (like walls) and areas that have valid_territory set to FALSE
/proc/get_safe_random_station_turf(list/areas_to_pick_from = SSmapping.existing_station_areas)
for (var/i in 1 to 5)
var/list/turf_list = get_area_turfs(pick(areas_to_pick_from))
var/turf/target
while (turf_list.len && !target)
var/I = rand(1, turf_list.len)
var/turf/checked_turf = turf_list[I]
var/area/turf_area = get_area(checked_turf)
if(!checked_turf.density && (turf_area.valid_territory) && !isgroundlessturf(checked_turf))
var/clear = TRUE
for(var/obj/checked_object in checked_turf)
if(checked_object.density)
clear = FALSE
break
if(clear)
target = checked_turf
if (!target)
turf_list.Cut(I, I + 1)
if (target)
return target
2 changes: 2 additions & 0 deletions code/_globalvars/lists/objects.dm
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ GLOBAL_LIST_INIT(machines, list())
GLOBAL_LIST_INIT(syndiepads, list()) //list of all syndiepads
GLOBAL_LIST_INIT(syndie_cargo_consoles, list()) //list of all syndie cargo consoles
GLOBAL_LIST_INIT(rcd_list, list()) //list of Rapid Construction Devices.
GLOBAL_LIST_EMPTY(supplypod_loading_bays)

GLOBAL_LIST_INIT(apcs, list())
GLOBAL_LIST_INIT(air_alarms, list())
Expand Down Expand Up @@ -64,3 +65,4 @@ GLOBAL_LIST_EMPTY(wire_color_directory) // This is an associative list with the
GLOBAL_LIST_EMPTY(wire_name_directory)

GLOBAL_LIST_EMPTY(visual_portals)
GLOBAL_LIST_EMPTY(pod_styles_by_type)
2 changes: 1 addition & 1 deletion code/_onclick/hud/map_view.dm
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ INITIALIZE_IMMEDIATE(/atom/movable/screen/map_view)
return pop_planes

/atom/movable/screen/map_view/proc/hide_from(mob/hide_from)
hide_from?.canon_client.clear_map(assigned_map)
hide_from?.canon_client?.clear_map(assigned_map)
var/client_ref = WEAKREF(hide_from?.canon_client)

// Make sure we clear the *right* hud
Expand Down
Loading

0 comments on commit e5d3527

Please sign in to comment.