diff --git a/code/game/objects/items/weapons/syndie.dm b/code/game/objects/items/weapons/syndie.dm index 3ba85b0bfc..c47489272b 100644 --- a/code/game/objects/items/weapons/syndie.dm +++ b/code/game/objects/items/weapons/syndie.dm @@ -63,6 +63,12 @@ T.dismantle_wall(1) qdel(src) +/obj/item/weapon/syndie/c4explosive/attackby(obj/item/weapon/W, mob/user) + if(istype(W, /obj/item/weapon/flame/lighter/zippo/c4detonator)) + var/obj/item/weapon/flame/lighter/zippo/c4detonator/D = W + D.bomb = src + return + ..() /*Detonator, disguised as a lighter*/ /*Click it when closed to open, when open to bring up a prompt asking you if you want to close it or press the button.*/ diff --git a/html/changelogs/Atermonera - package_bombs.yml b/html/changelogs/Atermonera - package_bombs.yml new file mode 100644 index 0000000000..bf26c75d4c --- /dev/null +++ b/html/changelogs/Atermonera - package_bombs.yml @@ -0,0 +1,4 @@ +author: Nerezza +delete-after: True +changes: + - rscadd: "Package bomb detonators can be re-bound by hitting the new package bomb with them." diff --git a/maps/submaps/surface_submaps/mountains/BlastMine1.dmm b/maps/submaps/surface_submaps/mountains/BlastMine1.dmm new file mode 100644 index 0000000000..34094caf86 --- /dev/null +++ b/maps/submaps/surface_submaps/mountains/BlastMine1.dmm @@ -0,0 +1,35 @@ +"a" = (/turf/simulated/mineral,/area/submap/cave/BlastMine1) +"b" = (/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/BlastMine1) +"c" = (/obj/structure/sign/warning/bomb_range,/turf/simulated/wall/sandstone,/area/submap/cave/BlastMine1) +"d" = (/obj/structure/table/rack,/obj/item/weapon/syndie/c4explosive,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/BlastMine1) +"e" = (/obj/structure/loot_pile/surface/bones,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/BlastMine1) +"f" = (/mob/living/simple_animal/hostile/savik{returns_home = 1},/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/BlastMine1) +"g" = (/obj/structure/table/rack,/obj/item/clothing/head/bomb_hood,/obj/item/clothing/suit/bomb_suit,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/BlastMine1) +"h" = (/obj/item/device/gps/internal/poi{gps_tag = "Unidentified Signal"},/turf/simulated/wall/sandstone,/area/submap/cave/BlastMine1) +"i" = (/mob/living/simple_animal/retaliate/diyaab,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/BlastMine1) +"j" = (/obj/structure/table/reinforced,/obj/item/weapon/flame/lighter/zippo/c4detonator{detonator_mode = 1},/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/BlastMine1) +"k" = (/obj/structure/table/rack,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/BlastMine1) +"l" = (/obj/machinery/floodlight,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/BlastMine1) +"m" = (/turf/simulated/wall/sandstone,/area/submap/cave/BlastMine1) +"n" = (/obj/structure/girder/displaced,/obj/structure/sign/warning/bomb_range,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/BlastMine1) +"o" = (/obj/structure/table,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/BlastMine1) +"p" = (/obj/effect/decal/remains/human,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/BlastMine1) +"q" = (/obj/structure/sign/warning/bomb_range,/turf/simulated/wall/sandstone{damage = 20},/area/submap/cave/BlastMine1) + +(1,1,1) = {" +aaabbbaaaa +aabbbbaaaa +aacbbbbaaa +aadbbbbbbb +abdbbecbbb +abdbfbgbbb +abhbbbbbba +abdibbgjaa +bbkbilmaaa +bbkbbbbbba +banbbbbbbb +abbbbbbbbb +aaopbbqbbb +bbbbbbbbba +baabbbaaaa +"} diff --git a/maps/submaps/surface_submaps/mountains/SupplyDrop1.dmm b/maps/submaps/surface_submaps/mountains/SupplyDrop1.dmm new file mode 100644 index 0000000000..7d2dac4f13 --- /dev/null +++ b/maps/submaps/surface_submaps/mountains/SupplyDrop1.dmm @@ -0,0 +1,23 @@ +"a" = (/turf/simulated/mineral,/area/submap/cave/SupplyDrop1) +"b" = (/turf/template_noop,/area/template_noop) +"c" = (/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/SupplyDrop1) +"d" = (/turf/simulated/wall/titanium,/area/submap/cave/SupplyDrop1) +"e" = (/obj/structure/droppod_door{dir = 1},/turf/simulated/wall/titanium,/area/submap/cave/SupplyDrop1) +"f" = (/turf/simulated/floor/reinforced,/area/submap/cave/SupplyDrop1) +"g" = (/obj/structure/droppod_door{dir = 8},/turf/simulated/wall/titanium,/area/submap/cave/SupplyDrop1) +"h" = (/obj/structure/closet/crate,/obj/item/weapon/gun/energy/stunrevolver,/obj/item/weapon/gun/energy/stunrevolver,/obj/item/weapon/storage/box/flare,/obj/item/stack/marker_beacon/ten,/obj/item/weapon/cell/device/weapon,/obj/item/weapon/cell/device/weapon,/obj/item/trash/tastybread,/obj/item/trash/tastybread,/obj/item/trash/sosjerky,/obj/item/trash/sosjerky,/obj/item/trash/liquidfood,/obj/item/trash/liquidfood,/obj/item/weapon/flame/lighter/random,/obj/item/device/gps,/turf/simulated/floor/reinforced,/area/submap/cave/SupplyDrop1) +"i" = (/obj/structure/droppod_door{dir = 4},/turf/simulated/wall/titanium,/area/submap/cave/SupplyDrop1) +"j" = (/obj/structure/droppod_door,/turf/simulated/wall/titanium,/area/submap/cave/SupplyDrop1) + +(1,1,1) = {" +aabbbccccb +aacccaaccb +acccccaccb +acccdedccb +cccddfddcc +cccgfhficc +bccddfddac +bbcadjdcac +bbaaacccac +bbcccccccc +"} diff --git a/maps/submaps/surface_submaps/mountains/mountains.dm b/maps/submaps/surface_submaps/mountains/mountains.dm index c7e6b513f5..58fdce2971 100644 --- a/maps/submaps/surface_submaps/mountains/mountains.dm +++ b/maps/submaps/surface_submaps/mountains/mountains.dm @@ -27,6 +27,8 @@ #include "IceCave1A.dmm" #include "IceCave1B.dmm" #include "IceCave1C.dmm" +#include "SupplyDrop1.dmm" +#include "BlastMine1.dmm" #endif // The 'mountains' is the mining z-level, and has a lot of caves. @@ -169,7 +171,12 @@ mappath = 'maps/submaps/surface_submaps/mountains/IceCave1C.dmm' cost = 10 - +/datum/map_template/surface/mountains/normal/supplydrop1 + name = "Supply Drop 1" + desc = "A drop pod that landed deep within the mountains." + mappath = 'maps/submaps/surface_submaps/mountains/SupplyDrop1.dmm' + cost = 10 + allow_duplicates = TRUE /************** * Deep Caves * @@ -237,4 +244,10 @@ name = "Mine Vault 5" desc = "A small xeno vault with potential loot. Also major horrible suprises." mappath = 'maps/submaps/surface_submaps/mountains/vault5.dmm' - cost = 25 \ No newline at end of file + cost = 25 + +/datum/map_template/surface/mountains/deep/BlastMine1 + name = "Blast Mine 1" + desc = "An abandoned blast mining site, seems that local wildlife has moved in." + mappath = 'maps/submaps/surface_submaps/mountains/BlastMine1.dmm' + cost = 20 diff --git a/maps/submaps/surface_submaps/mountains/mountains_areas.dm b/maps/submaps/surface_submaps/mountains/mountains_areas.dm index 04afe6b91d..e17290aa3a 100644 --- a/maps/submaps/surface_submaps/mountains/mountains_areas.dm +++ b/maps/submaps/surface_submaps/mountains/mountains_areas.dm @@ -76,4 +76,13 @@ name = "Ice Cave 1B" /area/submap/cave/IceCave1C - name = "Ice Cave 1C" \ No newline at end of file + + name = "Ice Cave 1C" + name = "Mine Vault" + +/area/submap/cave/SupplyDrop1 + name = "Supply Drop 1" + +/area/submap/cave/BlastMine1 + name = "Blast Mine 1" + diff --git a/maps/submaps/surface_submaps/plains/RationCache.dmm b/maps/submaps/surface_submaps/plains/RationCache.dmm new file mode 100644 index 0000000000..600832aa18 --- /dev/null +++ b/maps/submaps/surface_submaps/plains/RationCache.dmm @@ -0,0 +1,20 @@ +"a" = (/turf/template_noop,/area/template_noop) +"b" = (/turf/simulated/floor/outdoors/snow,/area/submap/RationCache) +"c" = (/mob/living/simple_animal/retaliate/diyaab{returns_home = 1},/turf/simulated/floor/outdoors/snow,/area/submap/RationCache) +"d" = (/mob/living/simple_animal/retaliate/diyaab{returns_home = 1},/turf/simulated/floor/outdoors/dirt,/area/submap/RationCache) +"e" = (/turf/simulated/floor/outdoors/dirt,/area/submap/RationCache) +"f" = (/obj/item/trash/liquidfood,/obj/item/trash/liquidfood,/obj/item/trash/liquidfood,/obj/item/trash/liquidfood,/obj/item/trash/liquidfood,/obj/item/trash/liquidfood,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/RationCache) +"g" = (/obj/machinery/portable_atmospherics/hydroponics/soil,/turf/simulated/floor/outdoors/dirt,/area/submap/RationCache) + +(1,1,1) = {" +aaaabbbaaa +aabbbbbbaa +abbbbcbbbb +abbbdbbcbb +bbcefebbbb +bbbegebbbb +bbbbebcbbb +bbbbbbbbaa +aabbcbbaaa +aabbbaaaaa +"} diff --git a/maps/submaps/surface_submaps/plains/SupplyDrop2.dmm b/maps/submaps/surface_submaps/plains/SupplyDrop2.dmm new file mode 100644 index 0000000000..7afbe010ab --- /dev/null +++ b/maps/submaps/surface_submaps/plains/SupplyDrop2.dmm @@ -0,0 +1,23 @@ +"a" = (/turf/template_noop,/area/template_noop) +"b" = (/turf/template_noop,/area/submap/SupplyDrop2) +"c" = (/turf/simulated/floor/plating,/area/submap/SupplyDrop2) +"d" = (/obj/structure/girder/displaced,/turf/template_noop,/area/submap/SupplyDrop2) +"e" = (/turf/simulated/wall/titanium,/area/submap/SupplyDrop2) +"f" = (/turf/simulated/floor/reinforced,/area/submap/SupplyDrop2) +"g" = (/obj/structure/loot_pile/maint/junk,/turf/simulated/floor/reinforced,/area/submap/SupplyDrop2) +"h" = (/obj/item/device/flashlight,/turf/simulated/floor/reinforced,/area/submap/SupplyDrop2) +"i" = (/obj/structure/loot_pile/maint/technical,/obj/item/device/gps/internal/poi,/obj/item/weapon/cell/device/weapon/empty,/obj/item/weapon/cell/device/weapon/empty,/turf/simulated/floor/plating,/area/submap/SupplyDrop2) +"j" = (/obj/structure/loot_pile/maint/technical,/turf/simulated/floor/reinforced,/area/submap/SupplyDrop2) +"k" = (/obj/structure/girder,/turf/template_noop,/area/submap/SupplyDrop2) +"l" = (/obj/structure/loot_pile/maint/trash,/turf/simulated/floor/reinforced,/area/submap/SupplyDrop2) +"m" = (/obj/structure/loot_pile/maint/trash,/turf/simulated/floor/plating,/area/submap/SupplyDrop2) + +(1,1,1) = {" +aabbcdaaa +abbefbbbb +bbeegeebb +bffhijfff +bbekcekbb +bbbkldbba +abbbmbbba +"} diff --git a/maps/submaps/surface_submaps/plains/plains.dm b/maps/submaps/surface_submaps/plains/plains.dm index 176c1d7f49..0d6a557d7a 100644 --- a/maps/submaps/surface_submaps/plains/plains.dm +++ b/maps/submaps/surface_submaps/plains/plains.dm @@ -24,7 +24,8 @@ #include "Snow3.dmm" #include "Snow4.dmm" #include "Snow5.dmm" - +#include "SupplyDrop2.dmm" +#include "RationCache.dmm" #endif @@ -181,3 +182,15 @@ desc = "Please stop the snow" mappath = 'maps/submaps/surface_submaps/plains/snow5.dmm' cost = 5 + +/datum/map_template/surface/plains/RationCache + name = "Ration Cache" + desc = "A forgotten cache of emergency rations." + mappath = 'maps/submaps/surface_submaps/plains/RationCache.dmm' + cost = 5 + +/datum/map_template/surface/plains/SupplyDrop2 + name = "Supply Drop 2" + desc = "A drop pod that's clearly been here a while, most of the things inside are rusted and worthless." + mappath = 'maps/submaps/surface_submaps/plains/SupplyDrop2.dmm' + cost = 8 \ No newline at end of file diff --git a/maps/submaps/surface_submaps/plains/plains_areas.dm b/maps/submaps/surface_submaps/plains/plains_areas.dm index 6de8a18113..c488d83431 100644 --- a/maps/submaps/surface_submaps/plains/plains_areas.dm +++ b/maps/submaps/surface_submaps/plains/plains_areas.dm @@ -73,3 +73,8 @@ /area/submap/snow5 name = "Snow5" +/area/submap/SupplyDrop2 + name = "Supply Drop 2" + +/area/submap/RationCache + name = "Ration Cache"