diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 8018bb0b2ee..4cf1e3c3648 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -2407,7 +2407,7 @@ /turf/open/floor/circuit, /area/ctf) "gm" = ( -/obj/structure/table/reinforced, +/obj/structure/table/reinforced/ctf, /turf/open/floor/plasteel/bluespace, /area/ctf) "gn" = ( @@ -2451,7 +2451,7 @@ /turf/open/floor/plasteel, /area/ctf) "gt" = ( -/obj/structure/kitchenspike, +/obj/structure/fluff/drake_statue, /turf/open/floor/plasteel/dark, /area/ctf) "gu" = ( @@ -11017,6 +11017,10 @@ /obj/item/seeds/cherry/bomb, /turf/open/floor/wood, /area/centcom/holding) +"yP" = ( +/obj/structure/fluff/drake_statue, +/turf/open/floor/circuit/red, +/area/ctf) "yU" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/centcom{ @@ -16187,6 +16191,10 @@ }, /turf/open/space/basic, /area/space) +"Km" = ( +/obj/structure/table/reinforced/ctf, +/turf/open/floor/plasteel/dark, +/area/ctf) "Kn" = ( /obj/structure/bookcase/random, /obj/effect/turf_decal/tile/neutral{ @@ -56773,6 +56781,7 @@ aa aa fZ gb +gl gh gh gh @@ -56780,8 +56789,7 @@ gh gh gh gh -gh -gh +gl gw fZ gk @@ -56803,6 +56811,7 @@ gl gk fZ gb +gl gh gh gh @@ -56810,8 +56819,7 @@ gh gh gh gh -gh -gh +gl gw fZ aa @@ -57030,15 +57038,15 @@ aa aa fZ gb +gl gh -gt gh -gt +hj +hj +hj gh -gt -gh -gt gh +gl gw fZ gk @@ -57060,15 +57068,15 @@ gl gk fZ gb +gl gh -gt gh -gt +hj +hj +hj gh -gt -gh -gt gh +gl gw fZ aa @@ -57287,15 +57295,15 @@ aa aa fZ gb +gl gh +gh +hj gt +hj gh -gt -gh -gt -gh -gt gh +gl gw fZ gk @@ -57317,15 +57325,15 @@ gl gk fZ gb +gl gh +gh +hj gt +hj gh -gt -gh -gt -gh -gt gh +gl gw fZ aa @@ -57544,15 +57552,15 @@ aa aa fZ gb +gl gh -gt gh -gt +hj +hj +hj gh -gt -gh -gt gh +gl gw fZ gk @@ -57574,15 +57582,15 @@ gl gk fZ gb +gl gh -gt gh -gt +hj +hj +hj gh -gt -gh -gt gh +gl gw fZ aa @@ -57801,6 +57809,7 @@ aa aa fZ gb +gl gh gh gh @@ -57808,8 +57817,7 @@ gh gh gh gh -gh -gh +gl gw fZ gk @@ -57831,6 +57839,7 @@ gl gk fZ gb +gl gh gh gh @@ -57838,8 +57847,7 @@ gh gh gh gh -gh -gh +gl gw fZ aa @@ -62977,9 +62985,9 @@ fZ fZ fZ fZ -gh -gh -gh +Km +Km +Km fZ fZ aa @@ -81959,6 +81967,7 @@ aa aa fZ ge +gq gh gh gh @@ -81966,8 +81975,7 @@ gh gh gh gh -gh -gh +gq gz fZ hf @@ -81989,6 +81997,7 @@ gq hf fZ ge +gq gh gh gh @@ -81996,8 +82005,7 @@ gh gh gh gh -gh -gh +gq gz fZ aa @@ -82216,15 +82224,15 @@ aa aa fZ ge +gq gh -gt gh -gt +hB +hB +hB gh -gt -gh -gt gh +gq gz fZ hf @@ -82246,15 +82254,15 @@ gq hf fZ ge +gq gh -gt gh -gt +hB +hB +hB gh -gt -gh -gt gh +gq gz fZ aa @@ -82473,15 +82481,15 @@ aa aa fZ ge +gq gh -gt gh -gt +hB +yP +hB gh -gt -gh -gt gh +gq gz fZ hf @@ -82503,15 +82511,15 @@ gq hf fZ ge +gq gh -gt gh -gt +hB +yP +hB gh -gt -gh -gt gh +gq gz fZ aa @@ -82730,15 +82738,15 @@ aa aa fZ ge +gq gh -gt gh -gt +hB +hB +hB gh -gt -gh -gt gh +gq gz fZ hf @@ -82760,15 +82768,15 @@ gq hf fZ ge +gq gh -gt gh -gt +hB +hB +hB gh -gt -gh -gt gh +gq gz fZ aa @@ -82987,6 +82995,7 @@ aa aa fZ ge +gq gh gh gh @@ -82994,8 +83003,7 @@ gh gh gh gh -gh -gh +gq gz fZ hf @@ -83017,6 +83025,7 @@ gq hf fZ ge +gq gh gh gh @@ -83024,8 +83033,7 @@ gh gh gh gh -gh -gh +gq gz fZ aa diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 6344caacca9..a14db956d47 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -469,7 +469,7 @@ icon_state = "r_table" deconstruction_ready = 0 buildstack = /obj/item/stack/sheet/plasteel - canSmoothWith = list(/obj/structure/table/reinforced, /obj/structure/table) + canSmoothWith = list(/obj/structure/table/reinforced, /obj/structure/table, /obj/structure/table/reinforced/ctf) max_integrity = 200 integrity_failure = 0.25 armor = list("melee" = 10, "bullet" = 30, "laser" = 30, "energy" = 100, "bomb" = 20, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 70) diff --git a/code/modules/awaymissions/capture_the_flag.dm b/code/modules/awaymissions/capture_the_flag.dm index 722e3a4e597..e9aad6d08ce 100644 --- a/code/modules/awaymissions/capture_the_flag.dm +++ b/code/modules/awaymissions/capture_the_flag.dm @@ -485,7 +485,7 @@ suit = /obj/item/clothing/suit/space/hardsuit/shielded/ctf toggle_helmet = FALSE // see the whites of their eyes shoes = /obj/item/clothing/shoes/combat - gloves = /obj/item/clothing/gloves/tackler/combat + gloves = /obj/item/clothing/gloves/combat id = /obj/item/card/id/away belt = /obj/item/gun/ballistic/automatic/pistol/deagle/ctf l_pocket = /obj/item/ammo_box/magazine/recharge/ctf @@ -591,6 +591,10 @@ /obj/structure/barricade/security/ctf/make_debris() new /obj/effect/ctf/dead_barricade(get_turf(src)) +/obj/structure/table/reinforced/ctf + resistance_flags = INDESTRUCTIBLE + flags_1 = NODECONSTRUCT_1 + /obj/effect/ctf density = FALSE anchored = TRUE