Merge branch 'master' into upstream-merge-12635

This commit is contained in:
Nadyr
2022-04-04 19:36:48 -04:00
committed by GitHub
159 changed files with 65896 additions and 2151 deletions

View File

@@ -72,7 +72,8 @@
var/list/restricted_programs = list(
"Burnoff Test Simulation" = new/datum/holodeck_program(/area/holodeck/source_burntest, list()),
"Wildlife Simulation" = new/datum/holodeck_program(/area/holodeck/source_wildlife, list())
"Wildlife Simulation" = new/datum/holodeck_program(/area/holodeck/source_wildlife, list()),
"Inside" = new/datum/holodeck_program(/area/holodeck/the_uwu_zone, list('sound/vore/sunesound/prey/loop.ogg')), //VOREStation add
)
/obj/machinery/computer/HolodeckControl/attack_ai(var/mob/user as mob)