From 6ed648206ae0ddc9f790ef8e9213c6ff7410b50d Mon Sep 17 00:00:00 2001 From: datlo Date: Wed, 23 Jan 2019 19:41:43 +0000 Subject: [PATCH] depot flags are prearmed with a minibomb --- _maps/map_files/cyberiad/z6.dmm | 2 +- code/game/objects/items/flag.dm | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/_maps/map_files/cyberiad/z6.dmm b/_maps/map_files/cyberiad/z6.dmm index 1e97fc39c60..ad0681b08b2 100644 --- a/_maps/map_files/cyberiad/z6.dmm +++ b/_maps/map_files/cyberiad/z6.dmm @@ -625,7 +625,7 @@ "ma" = (/obj/effect/decal/cleanable/cobweb2,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/outer) "mb" = (/obj/effect/landmark{name = "syndi_depot_bot"},/turf/simulated/floor/plating/airless/asteroid,/area/syndicate_depot/outer) "mc" = (/obj/machinery/light{dir = 1; on = 1},/obj/item/stack/sheet/metal{layer = 4.1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core) -"md" = (/obj/item/flag/chameleon{icon_state = "syndiflag"; name = "Syndicate Flag"; used = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core) +"md" = (/obj/item/flag/chameleon/prearmed{icon_state = "syndiflag"; name = "Syndicate Flag"; used = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core) "me" = (/turf/simulated/wall,/area/syndicate_depot/outer) "mf" = (/obj/effect/spawner/random_spawners/syndicate/turret/external,/turf/simulated/floor/plating/airless/asteroid,/area/syndicate_depot/outer) "mg" = (/obj/machinery/light,/turf/simulated/floor/plating/airless/asteroid,/area/syndicate_depot/outer) diff --git a/code/game/objects/items/flag.dm b/code/game/objects/items/flag.dm index 6359f2e9d7a..a19459916a7 100644 --- a/code/game/objects/items/flag.dm +++ b/code/game/objects/items/flag.dm @@ -216,7 +216,7 @@ if(used) return ..() - var/list/flag_types = typesof(/obj/item/flag) - list(src.type, /obj/item/flag) + var/list/flag_types = typesof(/obj/item/flag) - list(/obj/item/flag, /obj/item/flag/chameleon, /obj/item/flag/chameleon/prearmed) var/list/flag = list() for(var/flag_type in flag_types) @@ -274,3 +274,7 @@ /obj/item/flag/chameleon/updateFlagIcon() icon_state = updated_icon_state + +/obj/item/flag/chameleon/prearmed/New() + ..() + boobytrap = new /obj/item/grenade/syndieminibomb(src) \ No newline at end of file