shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Energy swords and other transforming energy weapons are now subtypes of transforming weapons (#2049)

Browse Source
This commit is contained in:
CitadelStationBot
2017-07-18 00:51:51 -05:00
committed by kevinz000
parent 7a173b95ed
commit bbc28aa856
30 changed files with 131 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/RandomZLevels/spacebattle.dmm
+2 -2
View File
@@ -384,7 +384,7 @@
/area/awaymission/spacebattle/syndicate3)
"bt" = (
/obj/structure/table/reinforced,
/obj/item/weapon/melee/energy/sword/saber/red,
/obj/item/weapon/melee/transforming/energy/sword/saber/red,
/turf/open/floor/mineral/plastitanium,
/area/awaymission/spacebattle/syndicate1)
"bu" = (
@@ -1479,7 +1479,7 @@
/area/awaymission/spacebattle/cruiser)
"eW" = (
/obj/effect/mob_spawn/human/syndicatesoldier,
/obj/item/weapon/melee/energy/sword/saber/red,
/obj/item/weapon/melee/transforming/energy/sword/saber/red,
/obj/effect/decal/cleanable/blood,
/turf/open/floor/plasteel,
/area/awaymission/spacebattle/cruiser)
_maps/map_files/generic/Centcomm.dmm
+4 -4
View File
@@ -2099,7 +2099,7 @@
/obj/item/clothing/suit/armor/tdome/red,
/obj/item/clothing/head/helmet/thunderdome,
/obj/item/weapon/melee/baton/loaded,
/obj/item/weapon/melee/energy/sword/saber/red,
/obj/item/weapon/melee/transforming/energy/sword/saber/red,
/obj/effect/turf_decal/stripes/line{
dir = 4
},
@@ -2136,7 +2136,7 @@
/obj/item/clothing/suit/armor/tdome/green,
/obj/item/clothing/head/helmet/thunderdome,
/obj/item/weapon/melee/baton/loaded,
/obj/item/weapon/melee/energy/sword/saber/green,
/obj/item/weapon/melee/transforming/energy/sword/saber/green,
/obj/effect/turf_decal/stripes/line{
dir = 8
},
@@ -11705,7 +11705,7 @@
/obj/item/clothing/suit/armor/tdome/red,
/obj/item/clothing/head/helmet/thunderdome,
/obj/item/weapon/melee/baton/loaded,
/obj/item/weapon/melee/energy/sword/saber/red,
/obj/item/weapon/melee/transforming/energy/sword/saber/red,
/obj/effect/turf_decal/stripes/line{
dir = 4
},
@@ -11825,7 +11825,7 @@
/obj/item/clothing/suit/armor/tdome/green,
/obj/item/clothing/head/helmet/thunderdome,
/obj/item/weapon/melee/baton/loaded,
/obj/item/weapon/melee/energy/sword/saber/green,
/obj/item/weapon/melee/transforming/energy/sword/saber/green,
/obj/effect/turf_decal/stripes/line{
dir = 8
},