From 95a2baaf060ff7d402bf776d1b138d2f34f9bea7 Mon Sep 17 00:00:00 2001 From: Steelpoint Date: Sat, 7 Oct 2023 16:32:45 +0800 Subject: [PATCH 1/3] InitalCommit --- maps/Nightmare/maps/DesertDam/scenario.json | 4 ++-- .../DesertDam/standalone/crashlanding-upp-alt1.dmm | 7 +------ 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/maps/Nightmare/maps/DesertDam/scenario.json b/maps/Nightmare/maps/DesertDam/scenario.json index bacb95e27c25..1f211f341a63 100644 --- a/maps/Nightmare/maps/DesertDam/scenario.json +++ b/maps/Nightmare/maps/DesertDam/scenario.json @@ -2,8 +2,8 @@ { "type": "pick", "name": "uppcrash", "choices": [ - { "weight": 10, "type": "def", "values": { "lvevent": "none" } }, - { "weight": 4, "type": "def", "values": { "lvevent": "uppcrash" } } + { "weight": 2, "type": "def", "values": { "lvevent": "none" } }, + { "weight": 10, "type": "def", "values": { "lvevent": "uppcrash" } } ] } ] diff --git a/maps/map_files/DesertDam/standalone/crashlanding-upp-alt1.dmm b/maps/map_files/DesertDam/standalone/crashlanding-upp-alt1.dmm index b707028441cf..4bfa1c4bc3f2 100644 --- a/maps/map_files/DesertDam/standalone/crashlanding-upp-alt1.dmm +++ b/maps/map_files/DesertDam/standalone/crashlanding-upp-alt1.dmm @@ -333,10 +333,6 @@ /obj/structure/closet/crate/ammo, /obj/item/ammo_magazine/rifle/type71/ap, /obj/item/ammo_magazine/rifle/type71/ap, -/obj/item/ammo_magazine/rifle/type71/ap, -/obj/item/ammo_magazine/rifle/type71/ap, -/obj/item/ammo_magazine/rifle/type71/ap, -/obj/item/ammo_magazine/rifle/type71/ap, /turf/open/shuttle/dropship{ icon_state = "rasputin15" }, @@ -836,8 +832,7 @@ /area/desert_dam/exterior/valley/valley_civilian) "Ny" = ( /obj/structure/closet/crate/ammo, -/obj/item/ammo_magazine/pkp, -/obj/item/weapon/gun/pkp, +/obj/item/weapon/gun/rifle/type71/flamer, /turf/open/shuttle/dropship{ icon_state = "rasputin15" }, From ec5ffcfacb0ba3e2d1ccc419107b81e0f2827273 Mon Sep 17 00:00:00 2001 From: Steelpoint Date: Sat, 7 Oct 2023 16:45:41 +0800 Subject: [PATCH 2/3] 100 --- maps/Nightmare/maps/DesertDam/scenario.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maps/Nightmare/maps/DesertDam/scenario.json b/maps/Nightmare/maps/DesertDam/scenario.json index 1f211f341a63..49672705d8a3 100644 --- a/maps/Nightmare/maps/DesertDam/scenario.json +++ b/maps/Nightmare/maps/DesertDam/scenario.json @@ -2,7 +2,7 @@ { "type": "pick", "name": "uppcrash", "choices": [ - { "weight": 2, "type": "def", "values": { "lvevent": "none" } }, + { "weight": 0, "type": "def", "values": { "lvevent": "none" } }, { "weight": 10, "type": "def", "values": { "lvevent": "uppcrash" } } ] } From ca6f8cd87a5e16af55451c3affe338b432c25fd3 Mon Sep 17 00:00:00 2001 From: Steelpoint Date: Sat, 7 Oct 2023 22:51:04 +0800 Subject: [PATCH 3/3] nightmare --- maps/Nightmare/maps/DesertDam/scenario.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/maps/Nightmare/maps/DesertDam/scenario.json b/maps/Nightmare/maps/DesertDam/scenario.json index 49672705d8a3..bacb95e27c25 100644 --- a/maps/Nightmare/maps/DesertDam/scenario.json +++ b/maps/Nightmare/maps/DesertDam/scenario.json @@ -2,8 +2,8 @@ { "type": "pick", "name": "uppcrash", "choices": [ - { "weight": 0, "type": "def", "values": { "lvevent": "none" } }, - { "weight": 10, "type": "def", "values": { "lvevent": "uppcrash" } } + { "weight": 10, "type": "def", "values": { "lvevent": "none" } }, + { "weight": 4, "type": "def", "values": { "lvevent": "uppcrash" } } ] } ]