Skip to content

Commit

Permalink
Quick build work until TAD lands off the LZ. (#824)
Browse files Browse the repository at this point in the history 
* HELP

* we can allow it

* work please

* better

* fix south butovo

* comment

* restart test

* work

* review fix
  • Loading branch information
@MalorMorfin
MalorMorfin authored Dec 19, 2024
1 parent 94f201f commit 7697d94
Show file tree
Hide file tree
Showing 9 changed files with 22 additions and 19 deletions.
3 changes: 2 additions & 1 deletion code/__DEFINES/dcs/signals.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
#define COMSIG_GLOB_OPEN_SHUTTERS_EARLY "!open_shutters_early"
#define COMSIG_GLOB_TELETOWER "!teletower"

#define COMSIG_GLOB_TADPOLE_LAUNCHED "!tadpole_launched"
//#define COMSIG_GLOB_TADPOLE_LAUNCHED "!tadpole_launched" for future
#define COMSIG_GLOB_TADPOLE_LANDED_OUT_LZ "!tadpole_landed_out_lz"
#define COMSIG_GLOB_DROPPOD_LANDED "!pod_landed"
#define COMSIG_GLOB_EVACUATION_STARTED "!evacuation_started"

Expand Down
4 changes: 2 additions & 2 deletions code/controllers/subsystem/processing/resinshaping.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ SUBSYSTEM_DEF(resinshaping)
/datum/controller/subsystem/resinshaping/proc/toggle_off()
SIGNAL_HANDLER
active = FALSE
UnregisterSignal(SSdcs, list(COMSIG_GLOB_OPEN_SHUTTERS_EARLY, COMSIG_GLOB_OPEN_TIMED_SHUTTERS_LATE,COMSIG_GLOB_OPEN_TIMED_SHUTTERS_XENO_HIVEMIND,COMSIG_GLOB_TADPOLE_LAUNCHED,COMSIG_GLOB_DROPPOD_LANDED))
UnregisterSignal(SSdcs, list(COMSIG_GLOB_OPEN_SHUTTERS_EARLY, COMSIG_GLOB_OPEN_TIMED_SHUTTERS_LATE,COMSIG_GLOB_OPEN_TIMED_SHUTTERS_XENO_HIVEMIND,COMSIG_GLOB_TADPOLE_LANDED_OUT_LZ,COMSIG_GLOB_DROPPOD_LANDED))

/datum/controller/subsystem/resinshaping/Initialize()
RegisterSignals(SSdcs, list(COMSIG_GLOB_OPEN_SHUTTERS_EARLY, COMSIG_GLOB_OPEN_TIMED_SHUTTERS_LATE,COMSIG_GLOB_OPEN_TIMED_SHUTTERS_XENO_HIVEMIND,COMSIG_GLOB_TADPOLE_LAUNCHED,COMSIG_GLOB_DROPPOD_LANDED), PROC_REF(toggle_off))
RegisterSignals(SSdcs, list(COMSIG_GLOB_OPEN_SHUTTERS_EARLY, COMSIG_GLOB_OPEN_TIMED_SHUTTERS_LATE,COMSIG_GLOB_OPEN_TIMED_SHUTTERS_XENO_HIVEMIND,COMSIG_GLOB_TADPOLE_LANDED_OUT_LZ,COMSIG_GLOB_DROPPOD_LANDED), PROC_REF(toggle_off))
for(var/hivenumber in GLOB.hive_datums)
quickbuild_points_by_hive[hivenumber] = SSmapping.configs[GROUND_MAP].quickbuilds
return SS_INIT_SUCCESS
Expand Down
4 changes: 2 additions & 2 deletions code/controllers/subsystem/silo.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ SUBSYSTEM_DEF(silo)
var/larva_spawn_rate_temporary_buff = 0

/datum/controller/subsystem/silo/Initialize()
RegisterSignals(SSdcs, list(COMSIG_GLOB_OPEN_TIMED_SHUTTERS_LATE, COMSIG_GLOB_OPEN_TIMED_SHUTTERS_XENO_HIVEMIND, COMSIG_GLOB_OPEN_SHUTTERS_EARLY, COMSIG_GLOB_TADPOLE_LAUNCHED), PROC_REF(start_spawning))
RegisterSignals(SSdcs, list(COMSIG_GLOB_OPEN_TIMED_SHUTTERS_LATE, COMSIG_GLOB_OPEN_TIMED_SHUTTERS_XENO_HIVEMIND, COMSIG_GLOB_OPEN_SHUTTERS_EARLY, COMSIG_GLOB_TADPOLE_LANDED_OUT_LZ), PROC_REF(start_spawning))
return SS_INIT_SUCCESS

/datum/controller/subsystem/silo/fire(resumed = 0)
Expand Down Expand Up @@ -47,6 +47,6 @@ SUBSYSTEM_DEF(silo)
///Activate the subsystem when shutters open and remove the free spawning when marines are joining
/datum/controller/subsystem/silo/proc/start_spawning()
SIGNAL_HANDLER
UnregisterSignal(SSdcs, list(COMSIG_GLOB_OPEN_TIMED_SHUTTERS_LATE, COMSIG_GLOB_OPEN_TIMED_SHUTTERS_XENO_HIVEMIND, COMSIG_GLOB_OPEN_SHUTTERS_EARLY, COMSIG_GLOB_TADPOLE_LAUNCHED))
UnregisterSignal(SSdcs, list(COMSIG_GLOB_OPEN_TIMED_SHUTTERS_LATE, COMSIG_GLOB_OPEN_TIMED_SHUTTERS_XENO_HIVEMIND, COMSIG_GLOB_OPEN_SHUTTERS_EARLY, COMSIG_GLOB_TADPOLE_LANDED_OUT_LZ))
if(SSticker.mode?.flags_round_type & MODE_SILO_RESPAWN)
can_fire = TRUE
3 changes: 3 additions & 0 deletions code/game/area/kutjevo.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -223,18 +223,21 @@
icon_state = "Colony_int"
ceiling = CEILING_METAL
minimap_color = MINIMAP_AREA_LZ
flags_area = MARINE_BASE

/area/kutjevo/interior/complex/Northwest_Flight_Control
name = "Kutjevo Complex - Northwest Flight Control Room"
icon_state = "Colony_int"
ceiling = CEILING_METAL
minimap_color = MINIMAP_AREA_LZ
flags_area = MARINE_BASE

/area/kutjevo/interior/complex/Northwest_Security_Checkpoint
name = "Kutjevo Complex - Northwest Security Checkpoint"
icon_state = "Colony_int"
ceiling = CEILING_METAL
minimap_color = MINIMAP_AREA_SEC
flags_area = MARINE_BASE

//Out buildings + foremans
/area/kutjevo/interior/power
Expand Down
4 changes: 2 additions & 2 deletions code/game/objects/structures/droppod.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ GLOBAL_LIST_INIT(blocked_droppod_tiles, typecacheof(list(/turf/open/space/transi
interaction_actions += new /datum/action/innate/set_drop_target(src)
interaction_actions += new /datum/action/innate/launch_droppod(src)
RegisterSignal(SSdcs, COMSIG_GLOB_DROPSHIP_HIJACKED, PROC_REF(disable_launching))
RegisterSignals(SSdcs, list(COMSIG_GLOB_OPEN_TIMED_SHUTTERS_LATE, COMSIG_GLOB_OPEN_TIMED_SHUTTERS_XENO_HIVEMIND, COMSIG_GLOB_OPEN_SHUTTERS_EARLY, COMSIG_GLOB_TADPOLE_LAUNCHED), PROC_REF(allow_drop))
RegisterSignals(SSdcs, list(COMSIG_GLOB_OPEN_TIMED_SHUTTERS_LATE, COMSIG_GLOB_OPEN_TIMED_SHUTTERS_XENO_HIVEMIND, COMSIG_GLOB_OPEN_SHUTTERS_EARLY, COMSIG_GLOB_TADPOLE_LANDED_OUT_LZ), PROC_REF(allow_drop))
GLOB.droppod_list += src
update_icon()
if((!locate(/obj/structure/drop_pod_launcher) in get_turf(src)) && mapload)
Expand Down Expand Up @@ -87,7 +87,7 @@ GLOBAL_LIST_INIT(blocked_droppod_tiles, typecacheof(list(/turf/open/space/transi
operation_started = TRUE
launch_allowed = TRUE
update_icon()
UnregisterSignal(SSdcs, list(COMSIG_GLOB_OPEN_TIMED_SHUTTERS_LATE, COMSIG_GLOB_OPEN_TIMED_SHUTTERS_XENO_HIVEMIND, COMSIG_GLOB_OPEN_SHUTTERS_EARLY, COMSIG_GLOB_TADPOLE_LAUNCHED))
UnregisterSignal(SSdcs, list(COMSIG_GLOB_OPEN_TIMED_SHUTTERS_LATE, COMSIG_GLOB_OPEN_TIMED_SHUTTERS_XENO_HIVEMIND, COMSIG_GLOB_OPEN_SHUTTERS_EARLY, COMSIG_GLOB_TADPOLE_LANDED_OUT_LZ))

/obj/structure/droppod/update_icon()
. = ..()
Expand Down
4 changes: 2 additions & 2 deletions code/modules/condor/cas_chair.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
. = ..()
set_cockpit_overlay("cockpit_closed")
RegisterSignal(SSdcs, COMSIG_GLOB_CAS_LASER_CREATED, PROC_REF(receive_laser_cas))
RegisterSignals(SSdcs, list(COMSIG_GLOB_OPEN_TIMED_SHUTTERS_LATE, COMSIG_GLOB_OPEN_TIMED_SHUTTERS_XENO_HIVEMIND, COMSIG_GLOB_OPEN_SHUTTERS_EARLY, COMSIG_GLOB_TADPOLE_LAUNCHED), PROC_REF(cas_usable))
RegisterSignals(SSdcs, list(COMSIG_GLOB_OPEN_TIMED_SHUTTERS_LATE, COMSIG_GLOB_OPEN_TIMED_SHUTTERS_XENO_HIVEMIND, COMSIG_GLOB_OPEN_SHUTTERS_EARLY, COMSIG_GLOB_TADPOLE_LANDED_OUT_LZ), PROC_REF(cas_usable))

/obj/structure/caspart/caschair/Destroy()
owner?.chair = null
Expand All @@ -37,7 +37,7 @@

/obj/structure/caspart/caschair/proc/cas_usable(datum/source)
SIGNAL_HANDLER
UnregisterSignal(SSdcs, list(COMSIG_GLOB_OPEN_TIMED_SHUTTERS_LATE, COMSIG_GLOB_OPEN_TIMED_SHUTTERS_XENO_HIVEMIND, COMSIG_GLOB_OPEN_SHUTTERS_EARLY, COMSIG_GLOB_TADPOLE_LAUNCHED))
UnregisterSignal(SSdcs, list(COMSIG_GLOB_OPEN_TIMED_SHUTTERS_LATE, COMSIG_GLOB_OPEN_TIMED_SHUTTERS_XENO_HIVEMIND, COMSIG_GLOB_OPEN_SHUTTERS_EARLY, COMSIG_GLOB_TADPOLE_LANDED_OUT_LZ))
cas_usable = TRUE
if(occupant)
to_chat(occupant, span_notice("Combat initiated, CAS now available."))
Expand Down
6 changes: 3 additions & 3 deletions code/modules/mob/living/carbon/xenomorph/abilities.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@
SIGNAL_HANDLER
dragging = FALSE
UnregisterSignal(owner, list(COMSIG_MOB_MOUSEDRAG, COMSIG_MOB_MOUSEUP, COMSIG_MOB_MOUSEDOWN))
UnregisterSignal(SSdcs, list(COMSIG_GLOB_OPEN_SHUTTERS_EARLY, COMSIG_GLOB_OPEN_TIMED_SHUTTERS_LATE,COMSIG_GLOB_OPEN_TIMED_SHUTTERS_XENO_HIVEMIND,COMSIG_GLOB_TADPOLE_LAUNCHED,COMSIG_GLOB_DROPPOD_LANDED))
UnregisterSignal(SSdcs, list(COMSIG_GLOB_OPEN_SHUTTERS_EARLY, COMSIG_GLOB_OPEN_TIMED_SHUTTERS_LATE,COMSIG_GLOB_OPEN_TIMED_SHUTTERS_XENO_HIVEMIND,COMSIG_GLOB_TADPOLE_LANDED_OUT_LZ,COMSIG_GLOB_DROPPOD_LANDED))

/// Extra handling for adding the action for draggin functionality (for instant building)
/datum/action/ability/activable/xeno/secrete_resin/give_action(mob/living/L)
Expand All @@ -243,14 +243,14 @@
RegisterSignal(owner, COMSIG_MOB_MOUSEDOWN, PROC_REF(start_resin_drag))
RegisterSignal(owner, COMSIG_MOB_MOUSEDRAG, PROC_REF(preshutter_resin_drag))
RegisterSignal(owner, COMSIG_MOB_MOUSEUP, PROC_REF(stop_resin_drag))
RegisterSignals(SSdcs, list(COMSIG_GLOB_OPEN_SHUTTERS_EARLY, COMSIG_GLOB_OPEN_TIMED_SHUTTERS_LATE,COMSIG_GLOB_OPEN_TIMED_SHUTTERS_XENO_HIVEMIND,COMSIG_GLOB_TADPOLE_LAUNCHED,COMSIG_GLOB_DROPPOD_LANDED), PROC_REF(end_resin_drag))
RegisterSignals(SSdcs, list(COMSIG_GLOB_OPEN_SHUTTERS_EARLY, COMSIG_GLOB_OPEN_TIMED_SHUTTERS_LATE,COMSIG_GLOB_OPEN_TIMED_SHUTTERS_XENO_HIVEMIND,COMSIG_GLOB_TADPOLE_LANDED_OUT_LZ,COMSIG_GLOB_DROPPOD_LANDED), PROC_REF(end_resin_drag))

/// Extra handling to remove the stuff needed for dragging
/datum/action/ability/activable/xeno/secrete_resin/remove_action(mob/living/carbon/xenomorph/X)
if(!CHECK_BITFIELD(SSticker.mode?.flags_round_type, MODE_ALLOW_XENO_QUICKBUILD))
return ..()
UnregisterSignal(owner, list(COMSIG_MOB_MOUSEDRAG, COMSIG_MOB_MOUSEUP, COMSIG_MOB_MOUSEDOWN))
UnregisterSignal(SSdcs, list(COMSIG_GLOB_OPEN_SHUTTERS_EARLY, COMSIG_GLOB_OPEN_TIMED_SHUTTERS_LATE,COMSIG_GLOB_OPEN_TIMED_SHUTTERS_XENO_HIVEMIND,COMSIG_GLOB_TADPOLE_LAUNCHED,COMSIG_GLOB_DROPPOD_LANDED))
UnregisterSignal(SSdcs, list(COMSIG_GLOB_OPEN_SHUTTERS_EARLY, COMSIG_GLOB_OPEN_TIMED_SHUTTERS_LATE,COMSIG_GLOB_OPEN_TIMED_SHUTTERS_XENO_HIVEMIND,COMSIG_GLOB_TADPOLE_LANDED_OUT_LZ,COMSIG_GLOB_DROPPOD_LANDED))
update_button_icon() //reason for the double return ..() here is owner gets unassigned in one of the parent procs, so we can't call parent before unregistering signals here
return ..()

Expand Down
4 changes: 2 additions & 2 deletions code/modules/power/groundmap_geothermal.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ GLOBAL_VAR_INIT(generators_on_ground, 0)

/obj/machinery/power/geothermal/Initialize(mapload)
. = ..()
RegisterSignals(SSdcs, list(COMSIG_GLOB_OPEN_TIMED_SHUTTERS_LATE, COMSIG_GLOB_OPEN_TIMED_SHUTTERS_XENO_HIVEMIND, COMSIG_GLOB_OPEN_SHUTTERS_EARLY, COMSIG_GLOB_TADPOLE_LAUNCHED), PROC_REF(activate_corruption))
RegisterSignals(SSdcs, list(COMSIG_GLOB_OPEN_TIMED_SHUTTERS_LATE, COMSIG_GLOB_OPEN_TIMED_SHUTTERS_XENO_HIVEMIND, COMSIG_GLOB_OPEN_SHUTTERS_EARLY, COMSIG_GLOB_TADPOLE_LANDED_OUT_LZ), PROC_REF(activate_corruption))
update_icon()

if(is_ground_level(z))
Expand Down Expand Up @@ -113,7 +113,7 @@ GLOBAL_VAR_INIT(generators_on_ground, 0)
///Allow generators to generate psych points
/obj/machinery/power/geothermal/proc/activate_corruption(datum/source)
SIGNAL_HANDLER
UnregisterSignal(SSdcs, list(COMSIG_GLOB_OPEN_TIMED_SHUTTERS_LATE, COMSIG_GLOB_OPEN_TIMED_SHUTTERS_XENO_HIVEMIND, COMSIG_GLOB_OPEN_SHUTTERS_EARLY, COMSIG_GLOB_TADPOLE_LAUNCHED))
UnregisterSignal(SSdcs, list(COMSIG_GLOB_OPEN_TIMED_SHUTTERS_LATE, COMSIG_GLOB_OPEN_TIMED_SHUTTERS_XENO_HIVEMIND, COMSIG_GLOB_OPEN_SHUTTERS_EARLY, COMSIG_GLOB_TADPOLE_LANDED_OUT_LZ))
corruption_on = TRUE
start_processing()

Expand Down
9 changes: 4 additions & 5 deletions code/modules/shuttle/mini_dropship.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
return
TIMER_COOLDOWN_START(src, COOLDOWN_TADPOLE_LAUNCHING, launching_delay) // To stop spamming
shuttle_port.shuttle_computer = src
SEND_GLOBAL_SIGNAL(COMSIG_GLOB_TADPOLE_LAUNCHED)
//SEND_GLOBAL_SIGNAL(COMSIG_GLOB_TADPOLE_LAUNCHED)
if(fly_state == SHUTTLE_ON_GROUND)
next_fly_state = SHUTTLE_IN_ATMOSPHERE
shuttle_port.callTime = SHUTTLE_TAKEOFF_GROUND_CALLTIME
Expand Down Expand Up @@ -220,10 +220,6 @@
ui = new(user, src, "Minidropship", name)
ui.open()

/obj/machinery/computer/camera_advanced/shuttle_docker/minidropship/ui_close(mob/user)
. = ..()
clean_ui_user()

/// Set ui_user to null to prevent hard del
/obj/machinery/computer/camera_advanced/shuttle_docker/minidropship/proc/clean_ui_user(datum/source)
SIGNAL_HANDLER
Expand Down Expand Up @@ -282,6 +278,9 @@
if(is_ground_level(origin.z)) //Safety check to prevent instant transmission
to_chat(owner, span_warning("The shuttle can't move while docked on the planet"))
return
var/area/landing_area = get_area(remote_eye)
if(!(landing_area.flags_area & MARINE_BASE))
SEND_GLOBAL_SIGNAL(COMSIG_GLOB_TADPOLE_LANDED_OUT_LZ)
origin.shuttle_port.callTime = SHUTTLE_LANDING_CALLTIME
origin.next_fly_state = SHUTTLE_ON_GROUND
origin.open_prompt = FALSE
Expand Down

0 comments on commit 7697d94

Please sign in to comment.