cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-15 00:53:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

All Secondary Goals use labels (#29776)

Browse Source 
* All Secondary Goals use labels

* Fixes.

* Fixes.

* Update code/__DEFINES/dcs/basetype_signals.dm

Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Signed-off-by: Charlie Nolan <funnyman3595@gmail.com>

---------

Signed-off-by: Charlie Nolan <funnyman3595@gmail.com>
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
This commit is contained in:
Charlie Nolan
2025-07-30 23:01:26 -07:00
committed by GitHub
parent 97d72d6e22
commit 435637e257
17 changed files with 107 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/shuttle/on_move.dm
+1
View File
@@ -1,5 +1,6 @@
// Shuttle on-movement //
/atom/movable/proc/onShuttleMove(turf/oldT, turf/T1, rotation, mob/calling_mob)
SEND_SIGNAL(src, COMSIG_MOVABLE_ON_SHUTTLE_MOVE, T1)
var/turf/newT = get_turf(src)
if(newT.z != oldT.z)
on_changed_z_level(oldT, newT)
code/modules/shuttle/supply.dm
+10 -7
View File
@@ -139,12 +139,9 @@
break
var/obj/structure/closet/crate/secure/personal/PC = new(T)
if(SG.requester_name)
PC.name = "goal crate ([SG.requester_name] in [SG.department])"
PC.desc = "This personal crate has been configured by CC for [SG.requester_name]'s use in completing the secondary goal [SG.name]."
PC.registered_name = SG.requester_name
else
PC.name = "goal crate (Unknown in [SG.department])"
PC.name = "goal crate"
PC.registered_name = SG.requester_name
PC.AddComponent(/datum/component/label/goal, SG.requester_name, SG.department, TRUE)
PC.locked = FALSE
PC.update_icon()
@@ -336,7 +333,7 @@
if(department_messages[department][message_piece] > 1)
count = " (x[department_messages[department][message_piece]])"
rc_message += "[message_piece][count]"
send_requests_console_message(rc_message, "Central Command", department, "Stamped with the Central Command rubber stamp.", "Verified by the Central Command receiving department.", RQ_NORMALPRIORITY)
send_requests_console_message(rc_message, "Procurement Office", department, "Stamped with the Central Command rubber stamp.", "Verified by the Central Command receiving department.", RQ_NORMALPRIORITY)
SSeconomy.centcom_message += "[msg]<hr>"
manifest = new
@@ -852,6 +849,12 @@
SSblackbox.record_feedback("nested tally", "cargo salvage sold", count, list(salvage_name, "count"))
SSblackbox.record_feedback("nested tally", "cargo salvage sold", item.credits, list(salvage_name, "credits"))
/datum/economy/simple_seller/shelved_items
/datum/economy/simple_seller/shelved_items/check_sell(obj/docking_port/mobile/supply/S, atom/movable/AM)
if(AM.GetComponent(/datum/component/shelved))
return COMSIG_CARGO_IS_SECURED
/datum/economy/cargo_shuttle_manifest
var/list/items_to_sell = list()
var/list/line_items = list()