Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/__defines/jobs.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Station Command jobs
#define JOB_SITE_MANAGER "Site Manager"
#define JOB_SITE_MANAGER "Foreman" // PY Edit - Foreman instead of Captain
// Site Manager alt titles
#define JOB_ALT_OVERSEER "Overseer"
#define JOB_ALT_FACILITY_DIRECTOR "Facility Director"
Expand Down
1 change: 1 addition & 0 deletions code/_global_vars/lists/mapping.dm
Original file line number Diff line number Diff line change
Expand Up @@ -67,3 +67,4 @@ GLOBAL_LIST_EMPTY(eventdestinations) // List of scatter landmarks for VOREStatio
GLOBAL_LIST_EMPTY(eventabductors) // List of scatter landmarks for VOREStation abductor portals

GLOBAL_LIST_EMPTY(bslockers) // List of (roundstart) bluespace lockers
GLOBAL_LIST_EMPTY(anomalystart) // PY Add - Turfs where anomaly things spawn
1 change: 1 addition & 0 deletions code/game/machinery/doors/door.dm
Original file line number Diff line number Diff line change
Expand Up @@ -483,6 +483,7 @@
do_animate("opening")
icon_state = "door0"
set_opacity(0)
SSrem.add_activity(DEPARTMENT_ENGINEERING, 1) // PY Edit - REM
addtimer(CALLBACK(src, PROC_REF(open_internalsetdensity),forced), anim_length_before_density)

/obj/machinery/door/proc/open_internalsetdensity(forced = 0)
Expand Down
7 changes: 7 additions & 0 deletions code/game/objects/effects/anomalies/_anomalies.dm
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@
/obj/effect/anomaly/proc/anomalyEffect(seconds_per_tick)
if(prob(move_chance) && !locate(/obj/effect/suspension_field) in get_turf(src))
move_anomaly()
SSrem.add_activity(DEPARTMENT_RESEARCH, 10) // PY Edit - Make REM got a bit crazy

// Used in anomaly harvesting - Normal anomalies shouldn't pulse
/obj/effect/anomaly/proc/anomalyPulse()
Expand All @@ -84,6 +85,7 @@
if(QDELETED(src))
return FALSE
stats.next_activation = world.time + rand(stats.min_activation, stats.max_activation)
SSrem.add_activity(DEPARTMENT_RESEARCH, 2) // PY Edit
return TRUE

/obj/effect/anomaly/proc/move_anomaly()
Expand All @@ -103,6 +105,7 @@
if(!isnull(anomaly_core))
anomaly_core.forceMove(get_turf(src))
anomaly_core = null
SSrem.add_activity(DEPARTMENT_RESEARCH, -20) // PY Edit - They did good! A small break
qdel(src)

/obj/effect/anomaly/proc/stabilize(anchor = FALSE, has_core = TRUE, add_stats = FALSE)
Expand All @@ -117,6 +120,10 @@
stats.attached_anomaly = WEAKREF(src)
stats.calculate_points()
density = TRUE
// PY Edit Start - A bit more dangerous, anomalies should be kept in check
SSrem.add_activity(DEPARTMENT_RESEARCH, 20)
SSrem.add_permanent_activity(DEPARTMENT_RESEARCH, 5)
// PY Edit End
return

/obj/effect/anomaly/attackby(obj/item/I, mob/user)
Expand Down
5 changes: 5 additions & 0 deletions code/game/objects/effects/landmarks.dm
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,11 @@
if("vinestart")
GLOB.vinestart += loc
delete_me = TRUE
// PY Edit Start - Anom Items
if("anomalystart")
GLOB.anomalystart += loc
delete_me = TRUE
// PY End - Anom Items

if(delete_me)
return INITIALIZE_HINT_QDEL
Expand Down
1 change: 1 addition & 0 deletions code/game/objects/items/devices/extrapolator.dm
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,7 @@
. = isolate_symptom(user, target, target_disease)
else
. = isolate_disease(user, target, target_disease)
SSrem.add_activity(DEPARTMENT_MEDICAL, 5) // PY Edit - REM
using = FALSE

/obj/item/extrapolator/proc/isolate_symptom(mob/living/user, atom/target, datum/disease/advance/target_disease)
Expand Down
1 change: 1 addition & 0 deletions code/game/objects/items/weapons/mop.dm
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ GLOBAL_LIST_BOILERPLATE(all_mops, /obj/item/mop)
if(T)
T.wash(CLEAN_SCRUB)
reagents.trans_to_turf(T, 1, 10)
SSrem.add_activity(DEPARTMENT_CIVILIAN, 1) // PY Edit - REM
user.balloon_alert(user, "you have finished mopping!")


Expand Down
4 changes: 2 additions & 2 deletions code/game/objects/items/weapons/storage/bible.dm
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ GLOBAL_LIST_INIT(bibleitemstates, list(
use_sound = 'sound/bureaucracy/bookopen.ogg'
drop_sound = 'sound/bureaucracy/bookclose.ogg'
special_handling = TRUE

/* PY Edit - Just a book
/obj/item/storage/bible/attack_self(mob/living/carbon/human/user)
. = ..(user)
if(.)
Expand Down Expand Up @@ -89,7 +89,7 @@ GLOBAL_LIST_INIT(bibleitemstates, list(
if(user.mind.assigned_role != JOB_CHAPLAIN)
return FALSE
return TRUE

*/
/obj/item/storage/bible/booze
name = "bible"
desc = "To be applied to the head repeatedly."
Expand Down
20 changes: 10 additions & 10 deletions code/modules/events/anomalies.dm
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
/datum/event/anomaly/announce()
if(isnull(impact_area))
impact_area = placer.find_valid_area()
command_announcement.Announce("Energetic flux wave detected on [ANOMALY_ANNOUNCE_DANGEROUS_TEXT] [impact_area.name].", "Anomaly Alert")
GLOB.command_announcement.Announce("Energetic flux wave detected on [ANOMALY_ANNOUNCE_DANGEROUS_TEXT] [impact_area.name].", "Anomaly Alert")

/datum/event/anomaly/start()
var/turf/anomaly_turf
Expand All @@ -35,7 +35,7 @@
/datum/event/anomaly/bioscrambler/announce()
if(isnull(impact_area))
impact_area = placer.find_valid_area()
command_announcement.Announce("Biologic trait swapping agent detected on [ANOMALY_ANNOUNCE_MEDIUM_TEXT] [impact_area.name].", "Anomaly Alert")
GLOB.command_announcement.Announce("Biologic trait swapping agent detected on [ANOMALY_ANNOUNCE_MEDIUM_TEXT] [impact_area.name].", "Anomaly Alert")

// Bluespace
/datum/event/anomaly/bluespace
Expand All @@ -46,7 +46,7 @@
/datum/event/anomaly/bluespace/announce()
if(isnull(impact_area))
impact_area = placer.find_valid_area()
command_announcement.Announce("Bluespace instability detected on [ANOMALY_ANNOUNCE_MEDIUM_TEXT] [impact_area.name].", "Anomaly Alert")
GLOB.command_announcement.Announce("Bluespace instability detected on [ANOMALY_ANNOUNCE_MEDIUM_TEXT] [impact_area.name].", "Anomaly Alert")

// Dimensional
/datum/event/anomaly/dimensional
Expand All @@ -64,7 +64,7 @@
/datum/event/anomaly/dimensional/announce()
if(isnull(impact_area))
impact_area = placer.find_valid_area()
command_announcement.Announce("Dimensional instability detected on [ANOMALY_ANNOUNCE_MEDIUM_TEXT] [impact_area.name].", "Anomaly Alert")
GLOB.command_announcement.Announce("Dimensional instability detected on [ANOMALY_ANNOUNCE_MEDIUM_TEXT] [impact_area.name].", "Anomaly Alert")

// Flux

Expand All @@ -76,7 +76,7 @@
/datum/event/anomaly/flux/announce()
if(isnull(impact_area))
impact_area = placer.find_valid_area()
command_announcement.Announce("Hyper-energetic flux wave detected on [ANOMALY_ANNOUNCE_DANGEROUS_TEXT] [impact_area.name].", "Anomaly Alert")
GLOB.command_announcement.Announce("Hyper-energetic flux wave detected on [ANOMALY_ANNOUNCE_DANGEROUS_TEXT] [impact_area.name].", "Anomaly Alert")

// Gravitational
/datum/event/anomaly/grav
Expand All @@ -87,7 +87,7 @@
/datum/event/anomaly/grav/announce()
if(isnull(impact_area))
impact_area = placer.find_valid_area()
command_announcement.Announce("Gravitational anomaly detected on [ANOMALY_ANNOUNCE_HARMFUL_TEXT] [impact_area.name].", "Anomaly Alert")
GLOB.command_announcement.Announce("Gravitational anomaly detected on [ANOMALY_ANNOUNCE_HARMFUL_TEXT] [impact_area.name].", "Anomaly Alert")

// Hallucination
/datum/event/anomaly/hallucination
Expand All @@ -98,7 +98,7 @@
/datum/event/anomaly/hallucination/announce()
if(isnull(impact_area))
impact_area = placer.find_valid_area()
command_announcement.Announce("Hallucinatory event detected on [ANOMALY_ANNOUNCE_MEDIUM_TEXT] [impact_area.name].", "Anomaly Alert")
GLOB.command_announcement.Announce("Hallucinatory event detected on [ANOMALY_ANNOUNCE_MEDIUM_TEXT] [impact_area.name].", "Anomaly Alert")

// Pyroclastic
/datum/event/anomaly/pyro
Expand All @@ -109,7 +109,7 @@
/datum/event/anomaly/pyro/announce()
if(isnull(impact_area))
impact_area = placer.find_valid_area()
command_announcement.Announce("Pyroclastic anomaly detected on [ANOMALY_ANNOUNCE_HARMFUL_TEXT] [impact_area.name].", "Anomaly Alert")
GLOB.command_announcement.Announce("Pyroclastic anomaly detected on [ANOMALY_ANNOUNCE_HARMFUL_TEXT] [impact_area.name].", "Anomaly Alert")

// Weather
/datum/event/anomaly/weather
Expand All @@ -120,7 +120,7 @@
/datum/event/anomaly/weather/announce()
if(isnull(impact_area))
impact_area = placer.find_valid_area()
command_announcement.Announce("Metereologic anomaly detected on [ANOMALY_ANNOUNCE_MEDIUM_TEXT] [impact_area.name].", "Anomaly Alert")
GLOB.command_announcement.Announce("Metereologic anomaly detected on [ANOMALY_ANNOUNCE_MEDIUM_TEXT] [impact_area.name].", "Anomaly Alert")

// Dust
/datum/event/anomaly/dust
Expand All @@ -131,4 +131,4 @@
/datum/event/anomaly/dust/announce()
if(isnull(impact_area))
impact_area = placer.find_valid_area()
command_announcement.Announce("Anomalous dust particles detected on [ANOMALY_ANNOUNCE_MEDIUM_TEXT] [impact_area.name].", "Anomaly Alert")
GLOB.command_announcement.Announce("Anomalous dust particles detected on [ANOMALY_ANNOUNCE_MEDIUM_TEXT] [impact_area.name].", "Anomaly Alert")
2 changes: 1 addition & 1 deletion code/modules/events/window_break.dm
Original file line number Diff line number Diff line change
Expand Up @@ -70,4 +70,4 @@
current_collateral.take_damage(current_collateral.health - (current_collateral.maxhealth / 5)) //set to 1/5th health

/datum/event/window_break/announce()
command_announcement.Announce("Structural integrity of windows at [chosen_location.loc.name] is failing. Immediate repair or replacement is advised.", "Structural Alert", ANNOUNCER_MSG_WINDOWBREAK)
GLOB.command_announcement.Announce("Structural integrity of windows at [chosen_location.loc.name] is failing. Immediate repair or replacement is advised.", "Structural Alert", ANNOUNCER_MSG_WINDOWBREAK) // PY Edit - Fix
2 changes: 2 additions & 0 deletions code/modules/food/food.dm
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@
src.pixel_y = rand(-6.0, 6)
AddElement(/datum/element/sellable/food_snack)

AddComponent(/datum/component/germ_sensitive) // PY Edit - Germ sensitive

/obj/item/reagent_containers/food/attackby(obj/item/W, mob/user)
. = ..()
attempt_changeling_test(W,user)
Expand Down
6 changes: 6 additions & 0 deletions code/modules/food/food/snacks.dm
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,9 @@
if(nutriment_amt)
reagents.add_reagent(REAGENT_ID_NUTRIMENT,(nutriment_amt*2),nutriment_desc)

if(!(canned || package)) // PY Edit - Germ sensitive
AddComponent(/datum/component/germ_sensitive)

//Placeholder for effect that trigger on eating that aren't tied to reagents.
/obj/item/reagent_containers/food/snacks/proc/On_Consume(mob/living/eater, mob/living/feeder)
SEND_SIGNAL(src, COMSIG_FOOD_EATEN, eater, feeder)
Expand Down Expand Up @@ -410,13 +413,16 @@
if(package_opening_state)
flick(package_opening_state, src)

AddComponent(/datum/component/germ_sensitive) // PY Edit - Food goes bad

/obj/item/reagent_containers/food/snacks/proc/uncan(mob/user)
canned = FALSE
to_chat(user, span_notice("You unseal \the [src] with a crack of metal."))
balloon_alert(user, "unsealed \the [src]")
playsound(loc,opening_sound, rand(10,50), 1)
if(canned_open_state)
icon_state = canned_open_state
AddComponent(/datum/component/germ_sensitive) // PY Edit - Food goes bad

////////////////////////////////////////////////////////////////////////////////
/// FOOD END
Expand Down
1 change: 1 addition & 0 deletions code/modules/mob/living/carbon/human/human_attackhand.dm
Original file line number Diff line number Diff line change
Expand Up @@ -633,6 +633,7 @@
emote("gasp")
Weaken(rand(10,25))
updatehealth()
SSrem.add_activity(DEPARTMENT_MEDICAL, -20) // PY Edit - Give them a break
//SShaunting.influence(HAUNTING_RESLEEVE) // Used for the Haunting module downstream. Not implemented upstream.

// This is measures in `Life()` ticks. E.g. 10 minute defib timer = 300 `Life()` ticks. // Original math was VERY off. Life() tick occurs every ~2 seconds, not every 2 world.time ticks.
Expand Down
4 changes: 4 additions & 0 deletions code/modules/power/lighting.dm
Original file line number Diff line number Diff line change
Expand Up @@ -339,6 +339,10 @@ GLOBAL_LIST_EMPTY(light_type_cache)
if(prob(L.broken_chance))
broken(1)

// PY Edit Start - REM
if(!mapload)
SSrem.add_activity(DEPARTMENT_ENGINEERING, 2)
// PY Edit End - REM
on = powered()
update(0)

Expand Down
5 changes: 5 additions & 0 deletions code/modules/research/tg/rdconsole.dm
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,11 @@ Nothing else in the console has ID requirements.
return FALSE
var/list/price = TN.get_price(stored_research)
if(stored_research.can_afford(price))
// PY Edit Start - REM
SSrem.add_activity(DEPARTMENT_RESEARCH, TN.activity)
if(TN.dangerous)
SSrem.add_permanent_activity(DEPARTMENT_RESEARCH, TN.dangerous)
// PY Edit End
user.investigate_log("researched [id]([json_encode(price)]) on techweb id [stored_research.id].", INVESTIGATE_RESEARCH)
// if(istype(stored_research, /datum/techweb/science))
// SSblackbox.record_feedback("associative", "science_techweb_unlock", 1, list("id" = "[id]", "name" = TN.display_name, "price" = "[json_encode(price)]", "time" = ISOtime()))
Expand Down
3 changes: 3 additions & 0 deletions code/modules/research/tg/techwebs/_techweb_node.dm
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@
*/
var/list/announce_channels

var/dangerous = 0 // PY Add - If this research is dangerous, add score to SSRem
var/activity = 5 // PY Add - How much department activity does node this add

/datum/techweb_node/error_node
id = "ERROR"
display_name = "ERROR"
Expand Down
1 change: 1 addition & 0 deletions code/modules/resleeving/machines.dm
Original file line number Diff line number Diff line change
Expand Up @@ -522,6 +522,7 @@
if(original_occupant)
occupant = original_occupant

SSrem.add_activity(DEPARTMENT_MEDICAL, -20) // PY Edit - Give them a break
playsound(src, 'sound/machines/medbayscanner1.ogg', 100, 1) // Play our sound at the end of the mind injection!
return 1

Expand Down
Loading
Loading