mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-13 17:14:47 +01:00
Merge branch 'master' of https://github.com/tgstation/tgstation into upstream-sync
This commit is contained in:
@@ -1 +1,2 @@
|
||||
/obj/machinery/computer/station_alert/station_only : /obj/machinery/computer/station_alert{@OLD}
|
||||
/obj/effect/landmark/start/hangover/closet : /obj/effect/landmark/start/hangover{@OLD}
|
||||
|
||||
Reference in New Issue
Block a user