Merge branch 'master' of https://github.com/Skyrat-SS13/Skyrat-tg into upstream-2406b

This commit is contained in:
Waterpig
2024-06-08 14:33:29 +02:00
453 changed files with 21546 additions and 18157 deletions
@@ -13,7 +13,7 @@
/datum/area_spawn/poppy
target_areas = list(/area/station/engineering/main, /area/station/engineering/break_room, /area/station/engineering/lobby, /area/station/engineering/supermatter/room)
desired_atom = /mob/living/simple_animal/pet/poppy
desired_atom = /mob/living/basic/pet/poppy
// Structures
/datum/area_spawn/secmed_locker