cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-27 14:07:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

depot flags are prearmed with a minibomb

Browse Source
This commit is contained in:
datlo
2019-01-23 19:41:43 +00:00
parent 12f100a7b8
commit 6ed648206a
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/cyberiad/z6.dmm
+1 -1
View File
@@ -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)
code/game/objects/items/flag.dm
+5 -1
View File
@@ -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)