Merge branch 'master' into found_and_hidden

This commit is contained in:
Trilbyspaceclone
2020-04-07 03:37:09 -04:00
committed by GitHub
82 changed files with 139687 additions and 3024 deletions
+2 -2
View File
@@ -120,8 +120,8 @@
w_items += secret.w_class
contents += secret
/obj/structure/toilet/secret/prison
secret_type = /obj/effect/spawner/lootdrop/prison_loot_toilet
/obj/structure/urinal
name = "urinal"