Skip to content

Commit

Permalink
Merge pull request #25 from wraith-54321/maint-fixes
Browse files Browse the repository at this point in the history
Fixes my maint change PR
  • Loading branch information
dwasint authored Jul 9, 2023
2 parents 6c5068b + 7085880 commit 36d5869
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
1 change: 0 additions & 1 deletion code/_globalvars/lists/maintenance_loot.dm
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,6 @@ GLOBAL_LIST_INIT(oddity_loot, list(//oddity: strange or crazy items
/obj/item/dice/d20/fate/stealth/one_use = 1, //Looks like a d20, keep the d20 in the uncommon pool.
/obj/item/shadowcloak = 1,
/obj/item/spear/grey_tide = 1,
/obj/item/storage/box/donkpockets/donkpocketgondola = 1,
list(//music
/obj/item/instrument/saxophone/spectral = 1,
/obj/item/instrument/trombone/spectral = 1,
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/effects/spawners/random/maintenance.dm
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@

//monkestation edit start
/obj/effect/spawner/random/maintenance/post_spawn(atom/movable/spawned_loot) //if an oddity spawns then ghosts should be told, as they could be pretty interesting to watch
if(locate(spawned_loot) in GLOB.oddity_loot)
if(spawned_loot.type in GLOB.oddity_loot) //running locate() will also return TRUE on parents of the typepath as well, mainly boxes
SSpoints_of_interest.make_point_of_interest(spawned_loot)
notify_ghosts("Maintenance has an object of interest: [spawned_loot]!", source=spawned_loot, action=NOTIFY_ORBIT, header="Something's Interesting!")
//monkestation edit end
Expand Down

0 comments on commit 36d5869

Please sign in to comment.