Skip to content

Commit

Permalink
Merge branch 'cmss13-devs:master' into XM43E1-alt2
Browse files Browse the repository at this point in the history
  • Loading branch information
@Kaga-404
Kaga-404 authored Feb 21, 2024
2 parents df664e9 + 87f7b4b commit eceee99
Show file tree
Hide file tree
Showing 9 changed files with 185 additions and 110 deletions.
13 changes: 11 additions & 2 deletions code/game/jobs/job/command/cic/staffofficer.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,17 @@
total_positions_so_far = positions
return positions

/datum/job/command/bridge/generate_entry_message(mob/living/carbon/human/H)
return ..()

/datum/job/command/bridge/generate_entry_conditions(mob/living/M, whitelist_status)
. = ..()
if(!islist(GLOB.marine_leaders[JOB_SO]))
GLOB.marine_leaders[JOB_SO] = list()
GLOB.marine_leaders[JOB_SO] += M
RegisterSignal(M, COMSIG_PARENT_QDELETING, PROC_REF(cleanup_leader_candidate))

/datum/job/command/bridge/proc/cleanup_leader_candidate(mob/M)
SIGNAL_HANDLER
GLOB.marine_leaders[JOB_SO] -= M

AddTimelock(/datum/job/command/bridge, list(
JOB_SQUAD_LEADER = 1 HOURS,
Expand Down
202 changes: 107 additions & 95 deletions code/game/machinery/computer/groundside_operations.dm
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#define COMMAND_SQUAD "Command"

/obj/structure/machinery/computer/groundside_operations
name = "groundside operations console"
desc = "This can be used for various important functions."
Expand All @@ -19,6 +21,7 @@
var/lz_selection = TRUE
var/has_squad_overwatch = TRUE
var/faction = FACTION_MARINE
var/show_command_squad = FALSE

/obj/structure/machinery/computer/groundside_operations/Initialize()
if(SSticker.mode && MODE_HAS_FLAG(MODE_FACTION_CLASH))
Expand Down Expand Up @@ -69,8 +72,11 @@
dat += "<BR><hr>"

if(has_squad_overwatch)
dat += "Current Squad: <A href='?src=\ref[src];operation=pick_squad'>[!isnull(current_squad) ? "[current_squad.name]" : "----------"]</A><BR>"
if(current_squad)
if(show_command_squad)
dat += "Current Squad: <A href='?src=\ref[src];operation=pick_squad'>Command</A><BR>"
else
dat += "Current Squad: <A href='?src=\ref[src];operation=pick_squad'>[!isnull(current_squad) ? "[current_squad.name]" : "----------"]</A><BR>"
if(current_squad || show_command_squad)
dat += get_overwatch_info()

dat += "<BR><A HREF='?src=\ref[user];mach_close=groundside_operations'>Close</A>"
Expand Down Expand Up @@ -104,98 +110,94 @@
</script>
"}

if(!current_squad)
dat += "No Squad selected!<BR>"
if(show_command_squad)
dat += format_list_of_marines(list(GLOB.marine_leaders[JOB_CO], GLOB.marine_leaders[JOB_XO]) + GLOB.marine_leaders[JOB_SO], list(JOB_CO, JOB_XO, JOB_SO))
else if(current_squad)
dat += format_list_of_marines(current_squad.marines_list, list(JOB_SQUAD_LEADER, JOB_SQUAD_SPECIALIST, JOB_SQUAD_MEDIC, JOB_SQUAD_ENGI, JOB_SQUAD_SMARTGUN, JOB_SQUAD_MARINE))
else
var/leader_text = ""
var/tl_text = ""
var/spec_text = ""
var/medic_text = ""
var/engi_text = ""
var/smart_text = ""
var/marine_text = ""
var/misc_text = ""
var/living_count = 0
var/almayer_count = 0
var/SSD_count = 0
var/helmetless_count = 0

for(var/X in current_squad.marines_list)
if(!X)
continue //just to be safe
var/mob_name = "unknown"
var/mob_state = ""
var/role = "unknown"
var/act_sl = ""
var/area_name = "<b>???</b>"
var/mob/living/carbon/human/H
if(ishuman(X))
H = X
mob_name = H.real_name
var/area/A = get_area(H)
var/turf/M_turf = get_turf(H)
if(A)
area_name = sanitize_area(A.name)

if(H.job)
role = H.job
else if(istype(H.wear_id, /obj/item/card/id)) //decapitated marine is mindless,
var/obj/item/card/id/ID = H.wear_id //we use their ID to get their role.
if(ID.rank)
role = ID.rank

switch(H.stat)
if(CONSCIOUS)
mob_state = "Conscious"
living_count++
if(UNCONSCIOUS)
mob_state = "<b>Unconscious</b>"
living_count++
else
continue

if(!is_ground_level(M_turf.z))
almayer_count++
continue
dat += "No Squad selected!<BR>"
dat += "<br><hr>"
dat += "<A href='?src=\ref[src];operation=refresh'>Refresh</a><br>"
return dat

if(!istype(H.head, /obj/item/clothing/head/helmet/marine))
helmetless_count++
/obj/structure/machinery/computer/groundside_operations/proc/format_list_of_marines(list/mob/living/carbon/human/marine_list, list/jobs_in_order)
var/dat = ""
var/list/job_order = list()

for(var/job in jobs_in_order)
job_order[job] = ""

var/misc_text = ""

var/living_count = 0
var/almayer_count = 0
var/SSD_count = 0
var/helmetless_count = 0
var/total_count = 0

for(var/X in marine_list)
if(!X)
continue //just to be safe
total_count++
var/mob_name = "unknown"
var/mob_state = ""
var/role = "unknown"
var/area_name = "<b>???</b>"
var/mob/living/carbon/human/H
var/act_sl = ""
if(ishuman(X))
H = X
mob_name = H.real_name
var/area/A = get_area(H)
var/turf/M_turf = get_turf(H)
if(A)
area_name = sanitize_area(A.name)

if(H.job)
role = H.job
else if(istype(H.wear_id, /obj/item/card/id)) //decapitated marine is mindless,
var/obj/item/card/id/ID = H.wear_id //we use their ID to get their role.
if(ID.rank)
role = ID.rank

switch(H.stat)
if(CONSCIOUS)
mob_state = "Conscious"
living_count++
if(UNCONSCIOUS)
mob_state = "<b>Unconscious</b>"
living_count++
else
continue

if(!H.key || !H.client)
SSD_count++
continue
if(H == current_squad.squad_leader && role != JOB_SQUAD_LEADER)
act_sl = "(ASL)"

var/marine_infos = "<tr><td><A href='?src=\ref[src];operation=use_cam;cam_target=\ref[H]'>[mob_name]</a></td><td>[role][act_sl]</td><td>[mob_state]</td><td>[area_name]</td></tr>"
switch(role)
if(JOB_SQUAD_LEADER)
leader_text += marine_infos
if(JOB_SQUAD_TEAM_LEADER)
tl_text += marine_infos
if(JOB_SQUAD_SPECIALIST)
spec_text += marine_infos
if(JOB_SQUAD_MEDIC)
medic_text += marine_infos
if(JOB_SQUAD_ENGI)
engi_text += marine_infos
if(JOB_SQUAD_SMARTGUN)
smart_text += marine_infos
if(JOB_SQUAD_MARINE)
marine_text += marine_infos
else
misc_text += marine_infos

dat += "<b>Total: [current_squad.marines_list.len] Deployed</b><BR>"
dat += "<b>Marines detected: [living_count] ([helmetless_count] no helmet, [SSD_count] SSD, [almayer_count] on Almayer)</b><BR>"
dat += "<center><b>Search:</b> <input type='text' id='filter' value='' onkeyup='updateSearch();' style='width:300px;'></center>"
dat += "<table id='marine_list' border='2px' style='width: 100%; border-collapse: collapse;' align='center'><tr>"
dat += "<th>Name</th><th>Role</th><th>State</th><th>Location</th></tr>"
dat += leader_text + tl_text + spec_text + medic_text + engi_text + smart_text + marine_text + misc_text
dat += "</table>"
dat += "<br><hr>"
dat += "<A href='?src=\ref[src];operation=refresh'>Refresh</a><br>"
if(!is_ground_level(M_turf.z))
almayer_count++
continue

if(!istype(H.head, /obj/item/clothing/head/helmet/marine))
helmetless_count++
continue

if(!H.key || !H.client)
SSD_count++
continue
if(current_squad)
if(H == current_squad.squad_leader && role != JOB_SQUAD_LEADER)
act_sl = " (ASL)"
var/marine_infos = "<tr><td><A href='?src=\ref[src];operation=use_cam;cam_target=\ref[H]'>[mob_name]</a></td><td>[role][act_sl]</td><td>[mob_state]</td><td>[area_name]</td></tr>"
if(role in job_order)
job_order[role] += marine_infos
else
misc_text += marine_infos
dat += "<b>Total: [total_count] Deployed</b><BR>"
dat += "<b>Marines detected: [living_count] ([helmetless_count] no helmet, [SSD_count] SSD, [almayer_count] on Almayer)</b><BR>"
dat += "<center><b>Search:</b> <input type='text' id='filter' value='' onkeyup='updateSearch();' style='width:300px;'></center>"
dat += "<table id='marine_list' border='2px' style='width: 100%; border-collapse: collapse;' align='center'><tr>"
dat += "<th>Name</th><th>Role</th><th>State</th><th>Location</th></tr>"
for(var/job in job_order)
dat += job_order[job]
dat += misc_text
dat += "</table>"
return dat

/obj/structure/machinery/computer/groundside_operations/Topic(href, href_list)
Expand Down Expand Up @@ -272,23 +274,31 @@
for(var/datum/squad/S in GLOB.RoleAuthority.squads)
if(S.active && S.faction == faction)
squad_list += S.name
squad_list += COMMAND_SQUAD

var/name_sel = tgui_input_list(usr, "Which squad would you like to look at?", "Pick Squad", squad_list)
if(!name_sel)
return

var/datum/squad/selected = get_squad_by_name(name_sel)
if(selected)
current_squad = selected
if(name_sel == COMMAND_SQUAD)
show_command_squad = TRUE
current_squad = null

else
to_chat(usr, "[icon2html(src, usr)] [SPAN_WARNING("Invalid input. Aborting.")]")
show_command_squad = FALSE

var/datum/squad/selected = get_squad_by_name(name_sel)
if(selected)
current_squad = selected
else
to_chat(usr, "[icon2html(src, usr)] [SPAN_WARNING("Invalid input. Aborting.")]")

if("use_cam")
if(isRemoteControlling(usr))
to_chat(usr, "[icon2html(src, usr)] [SPAN_WARNING("Unable to override console camera viewer. Track with camera instead. ")]")
return

if(current_squad)
if(current_squad || show_command_squad)
var/mob/cam_target = locate(href_list["cam_target"])
var/obj/structure/machinery/camera/new_cam = get_camera_from_target(cam_target)
if(!new_cam || !new_cam.can_use())
Expand Down Expand Up @@ -379,3 +389,5 @@
lz_selection = FALSE
has_squad_overwatch = FALSE
minimap_type = MINIMAP_FLAG_PMC

#undef COMMAND_SQUAD
33 changes: 32 additions & 1 deletion code/game/machinery/kitchen/processor.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,44 @@

/datum/food_processor_process/process(loc, what)
if (src.output && loc)
new src.output(loc)
var/obj/item/reagent_container/food/snacks/created_food = new src.output(loc)
var/obj/item/reagent_container/food/snacks/original_food = what
if(original_food.made_from_player)
created_food.made_from_player = original_food.made_from_player
created_food.name = (created_food.made_from_player + created_food.name)
if (what)
qdel(what)

/datum/food_processor_process/proc/can_use(mob/user)
// By default, anyone can do it.
return TRUE

/* objs */

/datum/food_processor_process/xenomeat
input = /obj/item/reagent_container/food/snacks/meat/xenomeat
output = /obj/item/reagent_container/food/snacks/meat/xenomeat/processed

/datum/food_processor_process/xenomeat/can_use(mob/user)
if(!skillcheck(user, SKILL_DOMESTIC, SKILL_DOMESTIC_MASTER))
to_chat(user, SPAN_DANGER("You aren't trained to remove dangerous substances from food!"))
return FALSE
return TRUE

/datum/food_processor_process/meat
input = /obj/item/reagent_container/food/snacks/meat
output = /obj/item/reagent_container/food/snacks/rawmeatball

/datum/food_processor_process/carpmeat
input = /obj/item/reagent_container/food/snacks/carpmeat
output = /obj/item/reagent_container/food/snacks/carpmeat/processed

/datum/food_processor_process/carpmeat/can_use(mob/user)
if(!skillcheck(user, SKILL_DOMESTIC, SKILL_DOMESTIC_MASTER))
to_chat(user, SPAN_DANGER("You aren't trained to remove dangerous substances from food!"))
return FALSE
return TRUE

/datum/food_processor_process/potato
input = /obj/item/reagent_container/food/snacks/grown/potato
output = /obj/item/reagent_container/food/snacks/rawsticks
Expand Down Expand Up @@ -88,6 +117,8 @@
if (!P)
to_chat(user, SPAN_DANGER("That probably won't blend."))
return 1
if(!P.can_use(user))
return 1
user.visible_message("[user] put [what] into [src].", \
"You put [what] into [src].")
user.drop_held_item()
Expand Down
Loading

0 comments on commit eceee99

Please sign in to comment.