From 12243e2fa50867e3d444acaa85a8929bceba6d00 Mon Sep 17 00:00:00 2001 From: Casey Date: Sat, 9 Apr 2022 00:40:38 -0400 Subject: [PATCH] Map tweaks! --- code/game/area/areas_vr.dm | 16 + code/game/objects/random/misc_vr.dm | 88 + code/modules/planet/virgo3c_vr.dm | 20 +- icons/mob/randomlandmarks.dmi | Bin 1131 -> 2658 bytes maps/groundbase/gb-z1.dmm | 15728 ++++++++-------- maps/groundbase/gb-z2.dmm | 6655 ++++--- maps/groundbase/gb-z3.dmm | 4337 +++-- maps/groundbase/groundbase.dm | 1 + maps/groundbase/groundbase_areas.dm | 8 + maps/groundbase/groundbase_defines.dm | 19 +- maps/groundbase/groundbase_poi_stuff.dm | 940 + maps/groundbase/pois/cave1.dmm | 82 + maps/groundbase/pois/cave10.dmm | 109 + maps/groundbase/pois/cave10b.dmm | 128 + maps/groundbase/pois/cave10c.dmm | 133 + maps/groundbase/pois/cave11.dmm | 109 + maps/groundbase/pois/cave11b.dmm | 128 + maps/groundbase/pois/cave11c.dmm | 139 + maps/groundbase/pois/cave12.dmm | 109 + maps/groundbase/pois/cave12b.dmm | 128 + maps/groundbase/pois/cave12c.dmm | 133 + maps/groundbase/pois/cave13.dmm | 80 + maps/groundbase/pois/cave13b.dmm | 99 + maps/groundbase/pois/cave13c.dmm | 103 + maps/groundbase/pois/cave14.dmm | 82 + maps/groundbase/pois/cave14b.dmm | 101 + maps/groundbase/pois/cave14c.dmm | 112 + maps/groundbase/pois/cave15.dmm | 65 + maps/groundbase/pois/cave15b.dmm | 84 + maps/groundbase/pois/cave15c.dmm | 81 + maps/groundbase/pois/cave16.dmm | 96 + maps/groundbase/pois/cave16b.dmm | 92 + maps/groundbase/pois/cave16c.dmm | 96 + maps/groundbase/pois/cave17.dmm | 76 + maps/groundbase/pois/cave17b.dmm | 95 + maps/groundbase/pois/cave17c.dmm | 99 + maps/groundbase/pois/cave18.dmm | 98 + maps/groundbase/pois/cave18b.dmm | 117 + maps/groundbase/pois/cave18c.dmm | 121 + maps/groundbase/pois/cave19.dmm | 98 + maps/groundbase/pois/cave19b.dmm | 117 + maps/groundbase/pois/cave19c.dmm | 121 + maps/groundbase/pois/cave1b.dmm | 101 + maps/groundbase/pois/cave1c.dmm | 101 + maps/groundbase/pois/cave2.dmm | 109 + maps/groundbase/pois/cave20.dmm | 98 + maps/groundbase/pois/cave20b.dmm | 117 + maps/groundbase/pois/cave20c.dmm | 121 + maps/groundbase/pois/cave21.dmm | 109 + maps/groundbase/pois/cave21b.dmm | 128 + maps/groundbase/pois/cave21c.dmm | 132 + maps/groundbase/pois/cave22.dmm | 109 + maps/groundbase/pois/cave22b.dmm | 128 + maps/groundbase/pois/cave22c.dmm | 140 + maps/groundbase/pois/cave23.dmm | 109 + maps/groundbase/pois/cave23b.dmm | 128 + maps/groundbase/pois/cave23c.dmm | 132 + maps/groundbase/pois/cave24.dmm | 109 + maps/groundbase/pois/cave24b.dmm | 128 + maps/groundbase/pois/cave24c.dmm | 132 + maps/groundbase/pois/cave25.dmm | 90 + maps/groundbase/pois/cave25b.dmm | 109 + maps/groundbase/pois/cave25c.dmm | 113 + maps/groundbase/pois/cave26.dmm | 82 + maps/groundbase/pois/cave26b.dmm | 101 + maps/groundbase/pois/cave26c.dmm | 98 + maps/groundbase/pois/cave27.dmm | 100 + maps/groundbase/pois/cave27b.dmm | 119 + maps/groundbase/pois/cave27c.dmm | 123 + maps/groundbase/pois/cave28.dmm | 82 + maps/groundbase/pois/cave28b.dmm | 101 + maps/groundbase/pois/cave28c.dmm | 105 + maps/groundbase/pois/cave29.dmm | 98 + maps/groundbase/pois/cave29b.dmm | 117 + maps/groundbase/pois/cave29c.dmm | 121 + maps/groundbase/pois/cave2b.dmm | 128 + maps/groundbase/pois/cave2c.dmm | 121 + maps/groundbase/pois/cave3.dmm | 58 + maps/groundbase/pois/cave30.dmm | 109 + maps/groundbase/pois/cave30b.dmm | 128 + maps/groundbase/pois/cave30c.dmm | 132 + maps/groundbase/pois/cave31.dmm | 87 + maps/groundbase/pois/cave31b.dmm | 100 + maps/groundbase/pois/cave31c.dmm | 110 + maps/groundbase/pois/cave32.dmm | 109 + maps/groundbase/pois/cave32b.dmm | 128 + maps/groundbase/pois/cave32c.dmm | 132 + maps/groundbase/pois/cave33.dmm | 73 + maps/groundbase/pois/cave33b.dmm | 92 + maps/groundbase/pois/cave33c.dmm | 96 + maps/groundbase/pois/cave34.dmm | 91 + maps/groundbase/pois/cave34b.dmm | 110 + maps/groundbase/pois/cave34c.dmm | 114 + maps/groundbase/pois/cave35.dmm | 70 + maps/groundbase/pois/cave35b.dmm | 89 + maps/groundbase/pois/cave35c.dmm | 93 + maps/groundbase/pois/cave36.dmm | 76 + maps/groundbase/pois/cave36b.dmm | 95 + maps/groundbase/pois/cave36c.dmm | 99 + maps/groundbase/pois/cave37.dmm | 50 + maps/groundbase/pois/cave37b.dmm | 69 + maps/groundbase/pois/cave37c.dmm | 73 + maps/groundbase/pois/cave38.dmm | 45 + maps/groundbase/pois/cave38b.dmm | 64 + maps/groundbase/pois/cave38c.dmm | 68 + maps/groundbase/pois/cave39.dmm | 91 + maps/groundbase/pois/cave39b.dmm | 110 + maps/groundbase/pois/cave39c.dmm | 114 + maps/groundbase/pois/cave3b.dmm | 77 + maps/groundbase/pois/cave3c.dmm | 77 + maps/groundbase/pois/cave4.dmm | 98 + maps/groundbase/pois/cave40.dmm | 109 + maps/groundbase/pois/cave40b.dmm | 121 + maps/groundbase/pois/cave40c.dmm | 125 + maps/groundbase/pois/cave41.dmm | 100 + maps/groundbase/pois/cave41b.dmm | 119 + maps/groundbase/pois/cave41c.dmm | 123 + maps/groundbase/pois/cave42.dmm | 50 + maps/groundbase/pois/cave42b.dmm | 69 + maps/groundbase/pois/cave42c.dmm | 73 + maps/groundbase/pois/cave43.dmm | 50 + maps/groundbase/pois/cave43b.dmm | 69 + maps/groundbase/pois/cave43c.dmm | 73 + maps/groundbase/pois/cave44.dmm | 45 + maps/groundbase/pois/cave44b.dmm | 64 + maps/groundbase/pois/cave44c.dmm | 68 + maps/groundbase/pois/cave45.dmm | 50 + maps/groundbase/pois/cave45b.dmm | 69 + maps/groundbase/pois/cave45c.dmm | 73 + maps/groundbase/pois/cave46.dmm | 45 + maps/groundbase/pois/cave46b.dmm | 64 + maps/groundbase/pois/cave46c.dmm | 68 + maps/groundbase/pois/cave47.dmm | 42 + maps/groundbase/pois/cave47b.dmm | 61 + maps/groundbase/pois/cave47c.dmm | 58 + maps/groundbase/pois/cave48.dmm | 45 + maps/groundbase/pois/cave48b.dmm | 64 + maps/groundbase/pois/cave48c.dmm | 68 + maps/groundbase/pois/cave49.dmm | 42 + maps/groundbase/pois/cave49b.dmm | 54 + maps/groundbase/pois/cave49c.dmm | 65 + maps/groundbase/pois/cave4b.dmm | 117 + maps/groundbase/pois/cave4c.dmm | 117 + maps/groundbase/pois/cave5.dmm | 73 + maps/groundbase/pois/cave50.dmm | 30 + maps/groundbase/pois/cave51.dmm | 25 + maps/groundbase/pois/cave52.dmm | 38 + maps/groundbase/pois/cave53.dmm | 55 + maps/groundbase/pois/cave54.dmm | 45 + maps/groundbase/pois/cave5b.dmm | 92 + maps/groundbase/pois/cave5c.dmm | 92 + maps/groundbase/pois/cave6.dmm | 65 + maps/groundbase/pois/cave6b.dmm | 84 + maps/groundbase/pois/cave6c.dmm | 88 + maps/groundbase/pois/cave7.dmm | 76 + maps/groundbase/pois/cave7b.dmm | 84 + maps/groundbase/pois/cave7c.dmm | 94 + maps/groundbase/pois/cave8.dmm | 90 + maps/groundbase/pois/cave8b.dmm | 109 + maps/groundbase/pois/cave8c.dmm | 113 + maps/groundbase/pois/cave9.dmm | 82 + maps/groundbase/pois/cave9b.dmm | 101 + maps/groundbase/pois/cave9c.dmm | 98 + maps/groundbase/pois/cavething1.dmm | 78 + maps/groundbase/pois/cavething10.dmm | 60 + maps/groundbase/pois/cavething11.dmm | 100 + maps/groundbase/pois/cavething12.dmm | 100 + maps/groundbase/pois/cavething13.dmm | 80 + maps/groundbase/pois/cavething14.dmm | 83 + maps/groundbase/pois/cavething2.dmm | 74 + maps/groundbase/pois/cavething3.dmm | 74 + maps/groundbase/pois/cavething4.dmm | 70 + maps/groundbase/pois/cavething5.dmm | 57 + maps/groundbase/pois/cavething6.dmm | 114 + maps/groundbase/pois/cavething7.dmm | 104 + maps/groundbase/pois/cavething8.dmm | 43 + maps/groundbase/pois/cavething9.dmm | 95 + maps/groundbase/pois/od-testthing-a.dmm | 98 + maps/groundbase/pois/outdoors1.dmm | 52 + maps/groundbase/pois/outdoors10.dmm | 203 + maps/groundbase/pois/outdoors11.dmm | 68 + maps/groundbase/pois/outdoors12.dmm | 68 + maps/groundbase/pois/outdoors13.dmm | 61 + maps/groundbase/pois/outdoors14.dmm | 108 + maps/groundbase/pois/outdoors15.dmm | 122 + maps/groundbase/pois/outdoors2.dmm | 92 + maps/groundbase/pois/outdoors3.dmm | 112 + maps/groundbase/pois/outdoors4.dmm | 153 + maps/groundbase/pois/outdoors5.dmm | 144 + maps/groundbase/pois/outdoors6.dmm | 115 + maps/groundbase/pois/outdoors7.dmm | 68 + maps/groundbase/pois/outdoors8.dmm | 54 + maps/groundbase/pois/outdoors9.dmm | 136 + maps/groundbase/pois/template.dmm | 20918 ++++++++++++++++++++++ 194 files changed, 52292 insertions(+), 13415 deletions(-) create mode 100644 maps/groundbase/groundbase_poi_stuff.dm create mode 100644 maps/groundbase/pois/cave1.dmm create mode 100644 maps/groundbase/pois/cave10.dmm create mode 100644 maps/groundbase/pois/cave10b.dmm create mode 100644 maps/groundbase/pois/cave10c.dmm create mode 100644 maps/groundbase/pois/cave11.dmm create mode 100644 maps/groundbase/pois/cave11b.dmm create mode 100644 maps/groundbase/pois/cave11c.dmm create mode 100644 maps/groundbase/pois/cave12.dmm create mode 100644 maps/groundbase/pois/cave12b.dmm create mode 100644 maps/groundbase/pois/cave12c.dmm create mode 100644 maps/groundbase/pois/cave13.dmm create mode 100644 maps/groundbase/pois/cave13b.dmm create mode 100644 maps/groundbase/pois/cave13c.dmm create mode 100644 maps/groundbase/pois/cave14.dmm create mode 100644 maps/groundbase/pois/cave14b.dmm create mode 100644 maps/groundbase/pois/cave14c.dmm create mode 100644 maps/groundbase/pois/cave15.dmm create mode 100644 maps/groundbase/pois/cave15b.dmm create mode 100644 maps/groundbase/pois/cave15c.dmm create mode 100644 maps/groundbase/pois/cave16.dmm create mode 100644 maps/groundbase/pois/cave16b.dmm create mode 100644 maps/groundbase/pois/cave16c.dmm create mode 100644 maps/groundbase/pois/cave17.dmm create mode 100644 maps/groundbase/pois/cave17b.dmm create mode 100644 maps/groundbase/pois/cave17c.dmm create mode 100644 maps/groundbase/pois/cave18.dmm create mode 100644 maps/groundbase/pois/cave18b.dmm create mode 100644 maps/groundbase/pois/cave18c.dmm create mode 100644 maps/groundbase/pois/cave19.dmm create mode 100644 maps/groundbase/pois/cave19b.dmm create mode 100644 maps/groundbase/pois/cave19c.dmm create mode 100644 maps/groundbase/pois/cave1b.dmm create mode 100644 maps/groundbase/pois/cave1c.dmm create mode 100644 maps/groundbase/pois/cave2.dmm create mode 100644 maps/groundbase/pois/cave20.dmm create mode 100644 maps/groundbase/pois/cave20b.dmm create mode 100644 maps/groundbase/pois/cave20c.dmm create mode 100644 maps/groundbase/pois/cave21.dmm create mode 100644 maps/groundbase/pois/cave21b.dmm create mode 100644 maps/groundbase/pois/cave21c.dmm create mode 100644 maps/groundbase/pois/cave22.dmm create mode 100644 maps/groundbase/pois/cave22b.dmm create mode 100644 maps/groundbase/pois/cave22c.dmm create mode 100644 maps/groundbase/pois/cave23.dmm create mode 100644 maps/groundbase/pois/cave23b.dmm create mode 100644 maps/groundbase/pois/cave23c.dmm create mode 100644 maps/groundbase/pois/cave24.dmm create mode 100644 maps/groundbase/pois/cave24b.dmm create mode 100644 maps/groundbase/pois/cave24c.dmm create mode 100644 maps/groundbase/pois/cave25.dmm create mode 100644 maps/groundbase/pois/cave25b.dmm create mode 100644 maps/groundbase/pois/cave25c.dmm create mode 100644 maps/groundbase/pois/cave26.dmm create mode 100644 maps/groundbase/pois/cave26b.dmm create mode 100644 maps/groundbase/pois/cave26c.dmm create mode 100644 maps/groundbase/pois/cave27.dmm create mode 100644 maps/groundbase/pois/cave27b.dmm create mode 100644 maps/groundbase/pois/cave27c.dmm create mode 100644 maps/groundbase/pois/cave28.dmm create mode 100644 maps/groundbase/pois/cave28b.dmm create mode 100644 maps/groundbase/pois/cave28c.dmm create mode 100644 maps/groundbase/pois/cave29.dmm create mode 100644 maps/groundbase/pois/cave29b.dmm create mode 100644 maps/groundbase/pois/cave29c.dmm create mode 100644 maps/groundbase/pois/cave2b.dmm create mode 100644 maps/groundbase/pois/cave2c.dmm create mode 100644 maps/groundbase/pois/cave3.dmm create mode 100644 maps/groundbase/pois/cave30.dmm create mode 100644 maps/groundbase/pois/cave30b.dmm create mode 100644 maps/groundbase/pois/cave30c.dmm create mode 100644 maps/groundbase/pois/cave31.dmm create mode 100644 maps/groundbase/pois/cave31b.dmm create mode 100644 maps/groundbase/pois/cave31c.dmm create mode 100644 maps/groundbase/pois/cave32.dmm create mode 100644 maps/groundbase/pois/cave32b.dmm create mode 100644 maps/groundbase/pois/cave32c.dmm create mode 100644 maps/groundbase/pois/cave33.dmm create mode 100644 maps/groundbase/pois/cave33b.dmm create mode 100644 maps/groundbase/pois/cave33c.dmm create mode 100644 maps/groundbase/pois/cave34.dmm create mode 100644 maps/groundbase/pois/cave34b.dmm create mode 100644 maps/groundbase/pois/cave34c.dmm create mode 100644 maps/groundbase/pois/cave35.dmm create mode 100644 maps/groundbase/pois/cave35b.dmm create mode 100644 maps/groundbase/pois/cave35c.dmm create mode 100644 maps/groundbase/pois/cave36.dmm create mode 100644 maps/groundbase/pois/cave36b.dmm create mode 100644 maps/groundbase/pois/cave36c.dmm create mode 100644 maps/groundbase/pois/cave37.dmm create mode 100644 maps/groundbase/pois/cave37b.dmm create mode 100644 maps/groundbase/pois/cave37c.dmm create mode 100644 maps/groundbase/pois/cave38.dmm create mode 100644 maps/groundbase/pois/cave38b.dmm create mode 100644 maps/groundbase/pois/cave38c.dmm create mode 100644 maps/groundbase/pois/cave39.dmm create mode 100644 maps/groundbase/pois/cave39b.dmm create mode 100644 maps/groundbase/pois/cave39c.dmm create mode 100644 maps/groundbase/pois/cave3b.dmm create mode 100644 maps/groundbase/pois/cave3c.dmm create mode 100644 maps/groundbase/pois/cave4.dmm create mode 100644 maps/groundbase/pois/cave40.dmm create mode 100644 maps/groundbase/pois/cave40b.dmm create mode 100644 maps/groundbase/pois/cave40c.dmm create mode 100644 maps/groundbase/pois/cave41.dmm create mode 100644 maps/groundbase/pois/cave41b.dmm create mode 100644 maps/groundbase/pois/cave41c.dmm create mode 100644 maps/groundbase/pois/cave42.dmm create mode 100644 maps/groundbase/pois/cave42b.dmm create mode 100644 maps/groundbase/pois/cave42c.dmm create mode 100644 maps/groundbase/pois/cave43.dmm create mode 100644 maps/groundbase/pois/cave43b.dmm create mode 100644 maps/groundbase/pois/cave43c.dmm create mode 100644 maps/groundbase/pois/cave44.dmm create mode 100644 maps/groundbase/pois/cave44b.dmm create mode 100644 maps/groundbase/pois/cave44c.dmm create mode 100644 maps/groundbase/pois/cave45.dmm create mode 100644 maps/groundbase/pois/cave45b.dmm create mode 100644 maps/groundbase/pois/cave45c.dmm create mode 100644 maps/groundbase/pois/cave46.dmm create mode 100644 maps/groundbase/pois/cave46b.dmm create mode 100644 maps/groundbase/pois/cave46c.dmm create mode 100644 maps/groundbase/pois/cave47.dmm create mode 100644 maps/groundbase/pois/cave47b.dmm create mode 100644 maps/groundbase/pois/cave47c.dmm create mode 100644 maps/groundbase/pois/cave48.dmm create mode 100644 maps/groundbase/pois/cave48b.dmm create mode 100644 maps/groundbase/pois/cave48c.dmm create mode 100644 maps/groundbase/pois/cave49.dmm create mode 100644 maps/groundbase/pois/cave49b.dmm create mode 100644 maps/groundbase/pois/cave49c.dmm create mode 100644 maps/groundbase/pois/cave4b.dmm create mode 100644 maps/groundbase/pois/cave4c.dmm create mode 100644 maps/groundbase/pois/cave5.dmm create mode 100644 maps/groundbase/pois/cave50.dmm create mode 100644 maps/groundbase/pois/cave51.dmm create mode 100644 maps/groundbase/pois/cave52.dmm create mode 100644 maps/groundbase/pois/cave53.dmm create mode 100644 maps/groundbase/pois/cave54.dmm create mode 100644 maps/groundbase/pois/cave5b.dmm create mode 100644 maps/groundbase/pois/cave5c.dmm create mode 100644 maps/groundbase/pois/cave6.dmm create mode 100644 maps/groundbase/pois/cave6b.dmm create mode 100644 maps/groundbase/pois/cave6c.dmm create mode 100644 maps/groundbase/pois/cave7.dmm create mode 100644 maps/groundbase/pois/cave7b.dmm create mode 100644 maps/groundbase/pois/cave7c.dmm create mode 100644 maps/groundbase/pois/cave8.dmm create mode 100644 maps/groundbase/pois/cave8b.dmm create mode 100644 maps/groundbase/pois/cave8c.dmm create mode 100644 maps/groundbase/pois/cave9.dmm create mode 100644 maps/groundbase/pois/cave9b.dmm create mode 100644 maps/groundbase/pois/cave9c.dmm create mode 100644 maps/groundbase/pois/cavething1.dmm create mode 100644 maps/groundbase/pois/cavething10.dmm create mode 100644 maps/groundbase/pois/cavething11.dmm create mode 100644 maps/groundbase/pois/cavething12.dmm create mode 100644 maps/groundbase/pois/cavething13.dmm create mode 100644 maps/groundbase/pois/cavething14.dmm create mode 100644 maps/groundbase/pois/cavething2.dmm create mode 100644 maps/groundbase/pois/cavething3.dmm create mode 100644 maps/groundbase/pois/cavething4.dmm create mode 100644 maps/groundbase/pois/cavething5.dmm create mode 100644 maps/groundbase/pois/cavething6.dmm create mode 100644 maps/groundbase/pois/cavething7.dmm create mode 100644 maps/groundbase/pois/cavething8.dmm create mode 100644 maps/groundbase/pois/cavething9.dmm create mode 100644 maps/groundbase/pois/od-testthing-a.dmm create mode 100644 maps/groundbase/pois/outdoors1.dmm create mode 100644 maps/groundbase/pois/outdoors10.dmm create mode 100644 maps/groundbase/pois/outdoors11.dmm create mode 100644 maps/groundbase/pois/outdoors12.dmm create mode 100644 maps/groundbase/pois/outdoors13.dmm create mode 100644 maps/groundbase/pois/outdoors14.dmm create mode 100644 maps/groundbase/pois/outdoors15.dmm create mode 100644 maps/groundbase/pois/outdoors2.dmm create mode 100644 maps/groundbase/pois/outdoors3.dmm create mode 100644 maps/groundbase/pois/outdoors4.dmm create mode 100644 maps/groundbase/pois/outdoors5.dmm create mode 100644 maps/groundbase/pois/outdoors6.dmm create mode 100644 maps/groundbase/pois/outdoors7.dmm create mode 100644 maps/groundbase/pois/outdoors8.dmm create mode 100644 maps/groundbase/pois/outdoors9.dmm create mode 100644 maps/groundbase/pois/template.dmm diff --git a/code/game/area/areas_vr.dm b/code/game/area/areas_vr.dm index 371701e5b6..e356063e2a 100644 --- a/code/game/area/areas_vr.dm +++ b/code/game/area/areas_vr.dm @@ -3,6 +3,7 @@ var/exit_message var/limit_mob_size = TRUE //If mob size is limited in the area. var/block_suit_sensors = FALSE //If mob size is limited in the area. + var/turf/ceiling_type /area/Entered(var/atom/movable/AM, oldLoc) . = ..() @@ -13,3 +14,18 @@ . = ..() if(exit_message && isliving(AM)) to_chat(AM, exit_message) + +/area/Initialize(mapload) + apply_ceiling() + . = ..() + +/area/proc/apply_ceiling() + if(!ceiling_type) + return + for(var/turf/T in contents) + if(T.outdoors >= 0) + continue + if(HasAbove(T.z)) + var/turf/TA = GetAbove(T) + if(isopenspace(TA)) + TA.ChangeTurf(ceiling_type, TRUE, TRUE, TRUE) diff --git a/code/game/objects/random/misc_vr.dm b/code/game/objects/random/misc_vr.dm index 7ca49131f0..91f2d713c4 100644 --- a/code/game/objects/random/misc_vr.dm +++ b/code/game/objects/random/misc_vr.dm @@ -100,3 +100,91 @@ prob(3);/obj/random/projectile/random, prob(5);/obj/random/multiple/voidsuit ) + +/obj/random/mainttoyloot + name = "random loot from maint" + desc = "A list of things that people can find in away missions." + icon = 'icons/mob/randomlandmarks.dmi' + icon_state = "fanc_trejur" + spawn_nothing_percentage = 50 + +/obj/random/mainttoyloot/item_to_spawn() + return pick(prob(50);/obj/item/weapon/aliencoin/basic, + prob(40);/obj/item/weapon/aliencoin/silver, + prob(30);/obj/item/weapon/aliencoin/gold, + prob(20);/obj/item/weapon/aliencoin/phoron, + prob(5);/obj/item/capture_crystal, + prob(5);/obj/item/device/perfect_tele, + prob(5);/obj/item/weapon/bluespace_harpoon, + prob(1);/obj/item/device/paicard, + prob(2);/obj/item/weapon/storage/backpack/dufflebag/syndie, + prob(2);/obj/item/weapon/storage/backpack/dufflebag/syndie/ammo, + prob(2);/obj/item/weapon/storage/backpack/dufflebag/syndie/med, + prob(2);/obj/item/clothing/mask/gas/voice, + prob(2);/obj/item/device/radio_jammer, + prob(1);/obj/item/toy/bosunwhistle, + prob(1);/obj/item/weapon/bananapeel, + prob(5);/obj/fiftyspawner/platinum, + prob(3);/obj/fiftyspawner/gold, + prob(3);/obj/fiftyspawner/silver, + prob(1);/obj/fiftyspawner/diamond, + prob(5);/obj/fiftyspawner/phoron, + prob(1);/obj/item/capture_crystal/random, + prob(1);/obj/random/unidentified_medicine + ) + +/obj/random/maintenance/misc //Clutter and loot for maintenance and away missions + name = "random maintenance item" + desc = "This is a random maintenance item." + icon = 'icons/mob/randomlandmarks.dmi' + icon_state = "trejur" + spawn_nothing_percentage = 25 + + +/obj/random/maintenance/misc/item_to_spawn() + return pick(prob(500);/obj/random/maintenance, + prob(300);/obj/random/maintenance/cargo, + prob(300);/obj/random/maintenance/engineering, + prob(300);/obj/random/maintenance/medical, + prob(300);/obj/random/maintenance/research, + prob(300);/obj/random/maintenance/security, + prob(300);/obj/random/maintenance/security, + prob(50);/obj/random/maintenance/morestuff, + prob(25);/obj/random/mainttoyloot, + prob(10);/obj/random/maintenance/foodstuff) + +/obj/random/maintenance/foodstuff + name = "random food or drink item" + desc = "This is a random maintenance item." + icon = 'icons/mob/randomlandmarks.dmi' + icon_state = "foodstuffs" + spawn_nothing_percentage = 0 + + +/obj/random/maintenance/foodstuff/item_to_spawn() + return pick(prob(100);/obj/random/snack, + prob(100);/obj/random/drinksoft, + prob(50);/obj/random/mre, + prob(10);/obj/random/donkpocketbox, + prob(1);/obj/random/meat) + +/obj/random/maintenance/morestuff + name = "random potentially useful things" + desc = "This is a random maintenance item." + icon = 'icons/mob/randomlandmarks.dmi' + icon_state = "trejur" + spawn_nothing_percentage = 0 + + +/obj/random/maintenance/misc/item_to_spawn() + return pick(prob(10);/obj/random/tool, + prob(1);/obj/random/toolbox, + prob(2);/obj/random/powercell, + prob(2);/obj/random/flashlight, + prob(1);/obj/random/pouch, + prob(1);/obj/random/thermalponcho, + prob(5);/obj/random/contraband, + prob(5);/obj/random/cargopod, + prob(1);/obj/item/weapon/flame/lighter/random, + prob(1);/obj/item/weapon/storage/wallet/random, + prob(1);/obj/random/cutout) diff --git a/code/modules/planet/virgo3c_vr.dm b/code/modules/planet/virgo3c_vr.dm index 28aeb581de..45bda721e9 100644 --- a/code/modules/planet/virgo3c_vr.dm +++ b/code/modules/planet/virgo3c_vr.dm @@ -166,7 +166,7 @@ var/datum/planet/virgo3c/planet_virgo3c = null temp_low = 273.15 // 0c light_modifier = 0.8 transition_chances = list( - WEATHER_CLEAR = 25, + WEATHER_CLEAR = 50, WEATHER_OVERCAST = 50, WEATHER_RAIN = 5, WEATHER_LIGHT_SNOW = 5 @@ -185,7 +185,7 @@ var/datum/planet/virgo3c/planet_virgo3c = null temp_low = 263.15 // -10c light_modifier = 0.7 transition_chances = list( - WEATHER_LIGHT_SNOW = 75, + WEATHER_LIGHT_SNOW = 25, WEATHER_OVERCAST = 25, WEATHER_SNOW = 10, WEATHER_RAIN = 5 @@ -206,7 +206,7 @@ var/datum/planet/virgo3c/planet_virgo3c = null light_modifier = 0.5 flight_failure_modifier = 5 transition_chances = list( - WEATHER_SNOW = 75, + WEATHER_SNOW = 25, WEATHER_LIGHT_SNOW = 25, WEATHER_BLIZZARD = 5 ) @@ -251,8 +251,8 @@ var/datum/planet/virgo3c/planet_virgo3c = null transition_chances = list( WEATHER_OVERCAST = 25, - WEATHER_RAIN = 50, - WEATHER_STORM = 10, + WEATHER_RAIN = 25, + WEATHER_STORM = 5, WEATHER_LIGHT_SNOW = 5 ) observed_message = "It is raining." @@ -294,8 +294,8 @@ var/datum/planet/virgo3c/planet_virgo3c = null effect_message = "Rain falls on you, drenching you in water." var/next_lightning_strike = 0 // world.time when lightning will strike. - var/min_lightning_cooldown = 5 SECONDS - var/max_lightning_cooldown = 1 MINUTE + var/min_lightning_cooldown = 1 SECONDS + var/max_lightning_cooldown = 5 MINUTE observed_message = "An intense storm pours down over the region." transition_messages = list( "You feel intense winds hit you as the weather takes a turn for the worst.", @@ -410,8 +410,8 @@ var/datum/planet/virgo3c/planet_virgo3c = null temp_low = 273.15 // 0c flight_failure_modifier = 25 transition_chances = list( - WEATHER_BLOODMOON = 75, - WEATHER_CLEAR = 25 + WEATHER_BLOODMOON = 25, + WEATHER_CLEAR = 75 ) observed_message = "Everything is red. Something really ominous is going on." transition_messages = list( @@ -545,6 +545,8 @@ VIRGO3C_TURF_CREATE(/turf/simulated/open) VIRGO3C_TURF_CREATE(/turf/simulated/floor/tiled/dark) VIRGO3C_TURF_CREATE(/turf/simulated/mineral) VIRGO3C_TURF_CREATE(/turf/simulated/floor) +VIRGO3C_TURF_CREATE(/turf/simulated/floor/wood) +VIRGO3C_TURF_CREATE(/turf/simulated/floor/wood/sif) /turf/simulated/floor/outdoors/grass/virgo3c VIRGO3C_SET_ATMOS diff --git a/icons/mob/randomlandmarks.dmi b/icons/mob/randomlandmarks.dmi index 5cdaf35cb6242241b71c66fa93b304c9b82c27d5..ae2f854fa6b90cb13f9167b25c963707f2de0eaf 100644 GIT binary patch literal 2658 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 Q#sB~S07*qoM6N<$f_!cWN&o-= delta 1123 zcmV-p1f2Wg6zd3(7k^*^0{{R3s1%ag0000CP)t-sz`(#FAT+?hz+3kJG`sZc00001 zbW%=J06^y0W&i*Hsd`jcbVOxyV{&P5bZKvH004NLh0#3N0&EFvYzz=bs(vaFMXH9h+XTmCtpF#17dVT?Wzb}D3QDXXeQ)>ri?K}8cW zs7OXpO@wFgs(QnspLF)iK>x2$x?59ypZWntb%sUYZ*2Gg00US_L_t(YiLI8wirX*{ zh9w-`ViH629)AmE&nts{mq9}=g?)wGdMbIfK(D=qp7tGb*;|)%MjF`~+q+9?hY-ou z=U=0lk!+>@!L&;a{kd|$c+ndAqwZd*O}t}+P#A$j{GkoKP_W2pdIsW;Iv^C5K(GP; z0%!#K0ZJb0~!K=#qKzT z0q|;iK=;%c3cvz{5@@K?5ny~;GJ~KUD88mUI%r2hGrlFKOkrpN+P)kxLtg@xd*~5uT$~Dl>o4+ z6OgxBw)6leEo!?pU@GEwZLa+PY|pKRcc#d}I}NlE+c z!kFczi_O9L5-?6>ASxKQN!JE2ssD5j>tbIS=J<${*k`>9y zcE{^Y0QhF@3Sj#P@KsD{hxji0ohP|IzkeR%WGhqLZ%S2g+rdRBIL$ys+Vv4dPAg8L z)qsOFLXRgg-gHdV=U-{CF1;M6v~ct7?)SIT8j#<(xH=%<1s$xu6+n;QNia;nm4KsA zu<_Wczn|aU0no_^oa)snCWRBN;$g)}Ryf~c91^fyC{*<+Mshn3luimxRhN{Dd0eQ+ z&!lJ-C+kN6q)56{hr3HkH?<3Z71R~rSgk2!dpW