From 7d784fae4586ce4902281cd472d83c407900afd9 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Tue, 9 May 2023 03:57:51 +0100 Subject: [PATCH] [MIRROR] Removes ELITE SYNDICATE MODSUIT from Space Ruin [MDB IGNORE] (#21003) * Removes ELITE SYNDICATE MODSUIT from Space Ruin (#75213) ## About The Pull Request - Removes an ELITE SYNDICATE MODSUIT SPAWN from infested_frigate.dmm - Removes a Combat Defibrillator from infested_frigate.dmm - Removes Dart Pistol from infested_frigate.dmm ## Why It's Good For The Game We will never learn. Space Loot should not be put in control of easily cheesable simplemobs, and we shouldn't be straight up putting NUKIE STUFF in Space ## Changelog :cl: Melbert del: You can't get an Elite Syndie Modsuit (or combat defib, or dart pistol) from Space Ruins /:cl: * Removes ELITE SYNDICATE MODSUIT from Space Ruin --------- Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com> Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com> --- .../SpaceRuins/infested_frigate.dmm | 103 +++++++++--------- code/modules/mob_spawn/corpses/mob_corpses.dm | 14 ++- 2 files changed, 64 insertions(+), 53 deletions(-) diff --git a/_maps/RandomRuins/SpaceRuins/infested_frigate.dmm b/_maps/RandomRuins/SpaceRuins/infested_frigate.dmm index 0b88630d72d..36203304575 100644 --- a/_maps/RandomRuins/SpaceRuins/infested_frigate.dmm +++ b/_maps/RandomRuins/SpaceRuins/infested_frigate.dmm @@ -79,9 +79,6 @@ }, /turf/open/floor/pod/dark, /area/ruin/space/has_grav/infested_frigate) -"bd" = ( -/turf/open/space/basic, -/area/ruin/space/has_grav/infested_frigate) "bg" = ( /obj/effect/turf_decal/tile/bar{ dir = 1 @@ -324,6 +321,24 @@ /obj/effect/mapping_helpers/airlock/locked, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/infested_frigate) +"dZ" = ( +/obj/structure/cable, +/obj/structure/alien/weeds, +/obj/effect/decal/cleanable/blood/gibs{ + icon_state = "floor6-old" + }, +/obj/item/shard{ + icon_state = "plastitaniumtiny" + }, +/mob/living/simple_animal/hostile/alien/queen/large{ + del_on_death = 1; + loot = list(/obj/effect/gibspawner/xeno,/obj/item/ammo_box/magazine/plastikov9mm,/obj/effect/mob_spawn/corpse/human/syndicatecommando/soft_suit); + desc = "What you saw in your dreams last night."; + faction = list("syndicate","xenomorph") + }, +/obj/structure/alien/egg/burst, +/turf/open/floor/plating, +/area/ruin/space/has_grav/infested_frigate) "ef" = ( /obj/structure/kitchenspike{ icon_state = "spikebloodymonkey"; @@ -570,13 +585,6 @@ /obj/effect/decal/cleanable/food/egg_smudge, /turf/open/floor/iron/freezer, /area/ruin/space/has_grav/infested_frigate) -"jk" = ( -/obj/structure/barricade/security, -/obj/structure/door_assembly/door_assembly_ext{ - anchored = 1 - }, -/turf/open/floor/mineral/plastitanium/airless, -/area/ruin/space/has_grav/infested_frigate) "jx" = ( /obj/effect/decal/cleanable/glass{ layer = 3.1 @@ -785,26 +793,6 @@ }, /turf/open/floor/plating, /area/ruin/space/has_grav/infested_frigate) -"nk" = ( -/obj/item/storage/medkit/o2, -/obj/item/storage/medkit/toxin, -/obj/item/defibrillator/compact/combat, -/obj/item/clothing/glasses/hud/health/night, -/obj/item/storage/pill_bottle/stimulant, -/obj/item/clothing/suit/apron/surgical, -/obj/item/healthanalyzer, -/obj/item/clothing/gloves/latex, -/obj/effect/turf_decal{ - icon_state = "bot_left_white" - }, -/obj/effect/turf_decal{ - icon_state = "warningline_white" - }, -/obj/structure/closet/syndicate, -/obj/structure/cable, -/obj/item/gun/syringe/syndicate, -/turf/open/floor/pod/dark, -/area/ruin/space/has_grav/infested_frigate) "nm" = ( /obj/machinery/vending/cigarette/syndicate, /obj/effect/turf_decal{ @@ -961,6 +949,25 @@ }, /turf/open/floor/pod/dark, /area/ruin/space/has_grav/infested_frigate) +"qx" = ( +/obj/item/storage/medkit/o2, +/obj/item/storage/medkit/toxin, +/obj/item/clothing/glasses/hud/health/night, +/obj/item/storage/pill_bottle/stimulant, +/obj/item/clothing/suit/apron/surgical, +/obj/item/healthanalyzer, +/obj/item/clothing/gloves/latex, +/obj/effect/turf_decal{ + icon_state = "bot_left_white" + }, +/obj/effect/turf_decal{ + icon_state = "warningline_white" + }, +/obj/structure/closet/syndicate, +/obj/structure/cable, +/obj/item/gun/syringe, +/turf/open/floor/pod/dark, +/area/ruin/space/has_grav/infested_frigate) "qC" = ( /obj/effect/turf_decal/tile/bar{ dir = 1 @@ -1012,6 +1019,16 @@ /obj/effect/mob_spawn/corpse/human/syndicatecommando/lessenedgear, /turf/open/floor/mineral/plastitanium/airless, /area/ruin/space/has_grav/infested_frigate) +"qW" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/obj/structure/barricade/security, +/obj/structure/door_assembly/door_assembly_ext{ + anchored = 1 + }, +/turf/open/floor/mineral/plastitanium/airless, +/area/ruin/space/has_grav/infested_frigate) "rd" = ( /obj/effect/decal/cleanable/blood/gibs/old{ icon_state = "gibmid1" @@ -2842,24 +2859,6 @@ /obj/item/ammo_casing/spent, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/infested_frigate) -"SM" = ( -/obj/structure/cable, -/obj/structure/alien/weeds, -/obj/effect/decal/cleanable/blood/gibs{ - icon_state = "floor6-old" - }, -/obj/item/shard{ - icon_state = "plastitaniumtiny" - }, -/mob/living/simple_animal/hostile/alien/queen/large{ - del_on_death = 1; - loot = list(/obj/effect/gibspawner/xeno,/obj/item/ammo_box/magazine/plastikov9mm,/obj/effect/mob_spawn/corpse/human/syndicatestormtrooper); - desc = "What you saw in your dreams last night."; - faction = list("syndicate","xenomorph") - }, -/obj/structure/alien/egg/burst, -/turf/open/floor/plating, -/area/ruin/space/has_grav/infested_frigate) "SS" = ( /obj/structure/table_frame, /obj/effect/decal/cleanable/glass, @@ -3262,7 +3261,7 @@ fl fl fl fl -bd +fl "} (2,1,1) = {" fl @@ -3442,7 +3441,7 @@ wP EQ wP hX -SM +dZ ME KT LF @@ -3712,14 +3711,14 @@ Gn xi KB wP -nk +qx ep wx LF cA vm qR -jk +qW fl fl "} diff --git a/code/modules/mob_spawn/corpses/mob_corpses.dm b/code/modules/mob_spawn/corpses/mob_corpses.dm index 2e4901a2793..5dd709bde66 100644 --- a/code/modules/mob_spawn/corpses/mob_corpses.dm +++ b/code/modules/mob_spawn/corpses/mob_corpses.dm @@ -42,12 +42,24 @@ outfit = /datum/outfit/syndicatecommandocorpse/lessenedgear /datum/outfit/syndicatecommandocorpse/lessenedgear - name = "Syndicate Commando Corpse" + name = "Syndicate Commando Corpse (Less Antag Gear)" gloves = /obj/item/clothing/gloves/tackler back = null id = null id_trim = null +/obj/effect/mob_spawn/corpse/human/syndicatecommando/soft_suit + outfit = /datum/outfit/syndicatecommandocorpse/soft_suit + +/datum/outfit/syndicatecommandocorpse/soft_suit + name = "Syndicate Commando Corpse (Softsuit)" + suit = /obj/item/clothing/suit/space/syndicate/black + head = /obj/item/clothing/head/helmet/space/syndicate/black + gloves = /obj/item/clothing/gloves/color/black + back = null + id = null + id_trim = null + /obj/effect/mob_spawn/corpse/human/syndicatestormtrooper name = "Syndicate Stormtrooper" hairstyle = "Bald"