diff --git a/_maps/map_files/generic/Admin_Zone.dmm b/_maps/map_files/generic/Admin_Zone.dmm index 29e8283512a..424dc03f2dd 100644 --- a/_maps/map_files/generic/Admin_Zone.dmm +++ b/_maps/map_files/generic/Admin_Zone.dmm @@ -4,17 +4,13 @@ /turf/simulated/floor/wood, /area/admin) "ac" = ( -/turf/simulated/floor/indestructible{ - icon_state = "floor" - }, +/turf/simulated/floor/indestructible/snow, /area/tdome/newtdome) "ad" = ( /obj/machinery/door/poddoor/shutters/invincible{ id_tag = "TD_CloseCombat" }, -/turf/simulated/floor/indestructible{ - icon_state = "floor" - }, +/turf/simulated/floor/indestructible/snow, /area/tdome/newtdome) "ah" = ( /obj/structure/table/wood/poker, @@ -630,7 +626,7 @@ /turf/simulated/floor/wood, /area/admin) "ga" = ( -/turf/simulated/wall/indestructible, +/turf/simulated/wall/indestructible/snow, /area/tdome/newtdome/CQC) "ge" = ( /obj/structure/table/wood, @@ -1345,6 +1341,12 @@ icon_state = "floor" }, /area/holodeck/source_basketball) +"nl" = ( +/obj/structure/flora/tree/pine/xmas{ + armor = list("melee" = 1000, "bullet" = 1000, "laser" = 1000, "energy" = 1000, "bomb" = 1000, "bio" = 1000, "rad" = 1000, "fire" = 500, "acid" = 500) + }, +/turf/simulated/floor/indestructible/snow, +/area/tdome/newtdome/CQC) "nu" = ( /obj/structure/flora/ausbushes/sparsegrass, /turf/simulated/floor/holofloor{ @@ -2175,9 +2177,7 @@ }, /area/admin) "yQ" = ( -/turf/simulated/floor/indestructible{ - icon_state = "floor" - }, +/turf/simulated/floor/indestructible/snow, /area/tdome/newtdome/CQC) "yT" = ( /obj/structure/table/wood, @@ -2535,6 +2535,9 @@ icon_state = "green" }, /area/holodeck/source_boxingcourt) +"CC" = ( +/turf/simulated/wall/indestructible/snow, +/area/space) "CD" = ( /obj/structure/chair/stool/holostool, /turf/simulated/floor/holofloor{ @@ -3816,9 +3819,7 @@ /obj/minigame_anchor/thunderdome_poller/melee, /obj/minigame_anchor/thunderdome_poller/mixed, /obj/minigame_anchor/thunderdome_poller/ranged, -/turf/simulated/floor/indestructible{ - icon_state = "floor" - }, +/turf/simulated/floor/indestructible/snow, /area/tdome/newtdome/CQC) "UB" = ( /obj/structure/table/wood, @@ -4182,7 +4183,7 @@ /turf/space, /area/space) "Yz" = ( -/turf/simulated/wall/indestructible, +/turf/simulated/wall/indestructible/snow, /area/tdome/newtdome) "YC" = ( /turf/simulated/floor/beach/sand, @@ -59375,29 +59376,29 @@ Yq Yq Yq Yq -QQ -QQ -QQ -QQ -QQ -QQ -QQ -QQ -QQ -QQ -QQ -QQ -QQ -QQ -QQ -QQ -QQ -QQ -QQ -QQ -QQ -QQ -QQ +CC +CC +CC +CC +CC +CC +CC +CC +CC +CC +CC +CC +CC +CC +CC +CC +CC +CC +CC +CC +CC +CC +CC Yq Yq Yq @@ -59632,7 +59633,7 @@ Yq Yq Yq Yq -QQ +CC ac Yz ac @@ -59654,7 +59655,7 @@ ac ac Yz ac -QQ +CC Yq Yq Yq @@ -59889,7 +59890,7 @@ Yq Yq Yq Yq -QQ +CC ac ac Yz @@ -59911,7 +59912,7 @@ ac Yz ac ac -QQ +CC Yq Yq Yq @@ -60146,7 +60147,7 @@ Yq Yq Yq Yq -QQ +CC ac ac ac @@ -60168,7 +60169,7 @@ ac ac ac ac -QQ +CC Yq Yq Yq @@ -60403,7 +60404,7 @@ Yq Yq Yq Yq -QQ +CC ac ac ac @@ -60425,7 +60426,7 @@ ad ac ac ac -QQ +CC Yq Yq Yq @@ -60660,7 +60661,7 @@ Yq Yq Yq Yq -QQ +CC ac ac ac @@ -60682,7 +60683,7 @@ ad ac ac ac -QQ +CC Yq Yq Yq @@ -60917,7 +60918,7 @@ Yq Yq Yq Yq -QQ +CC ac ac ac @@ -60939,7 +60940,7 @@ ad ac ac ac -QQ +CC Yq Yq Yq @@ -61174,7 +61175,7 @@ Yq Yq Yq Yq -QQ +CC ac ac Yz @@ -61196,7 +61197,7 @@ ad Yz ac ac -QQ +CC Yq Yq Yq @@ -61431,7 +61432,7 @@ Yq Yq Yq Yq -QQ +CC ac ac ac @@ -61453,7 +61454,7 @@ ad ac ac ac -QQ +CC Yq Yq Yq @@ -61688,7 +61689,7 @@ Yq Yq Yq Yq -QQ +CC ac ac ac @@ -61710,7 +61711,7 @@ ad ac ac ac -QQ +CC Yq Yq Yq @@ -61945,7 +61946,7 @@ Yq Yq Yq Yq -QQ +CC ac ac ac @@ -61967,7 +61968,7 @@ ad ac ac ac -QQ +CC Yq Yq Yq @@ -62202,7 +62203,7 @@ Yq Yq Yq Yq -QQ +CC ac Yz ac @@ -62212,7 +62213,7 @@ ga yQ yQ ga -yQ +nl Uw yQ ga @@ -62224,7 +62225,7 @@ ad ac Yz ac -QQ +CC Yq Yq Yq @@ -62459,7 +62460,7 @@ Yq Yq Yq Yq -QQ +CC ac ac ac @@ -62481,7 +62482,7 @@ ad ac ac ac -QQ +CC Yq Yq Yq @@ -62716,7 +62717,7 @@ Yq Yq Yq Yq -QQ +CC ac ac ac @@ -62738,7 +62739,7 @@ ad ac ac ac -QQ +CC Yq Yq Yq @@ -62973,7 +62974,7 @@ Yq Yq Yq Yq -QQ +CC ac ac ac @@ -62995,7 +62996,7 @@ ad ac ac ac -QQ +CC Yq Yq Yq @@ -63230,7 +63231,7 @@ Yq Yq Yq Yq -QQ +CC ac ac Yz @@ -63252,7 +63253,7 @@ ad Yz ac ac -QQ +CC Yq Yq Yq @@ -63487,7 +63488,7 @@ Yq Yq Yq Yq -QQ +CC ac ac ac @@ -63509,7 +63510,7 @@ ad ac ac ac -QQ +CC Yq Yq Yq @@ -63744,7 +63745,7 @@ Yq Yq Yq Yq -QQ +CC ac ac ac @@ -63766,7 +63767,7 @@ ad ac ac ac -QQ +CC Yq Yq Yq @@ -64001,7 +64002,7 @@ Yq Yq Yq Yq -QQ +CC ac ac ac @@ -64023,7 +64024,7 @@ ad ac ac ac -QQ +CC Yq Yq Yq @@ -64258,7 +64259,7 @@ Yq Yq Yq Yq -QQ +CC ac ac ac @@ -64280,7 +64281,7 @@ ac ac ac ac -QQ +CC Yq Yq Yq @@ -64515,7 +64516,7 @@ Yq Yq Yq Yq -QQ +CC ac ac Yz @@ -64537,7 +64538,7 @@ ac Yz ac ac -QQ +CC Yq Yq Yq @@ -64772,7 +64773,7 @@ Yq Yq Yq Yq -QQ +CC ac Yz ac @@ -64794,7 +64795,7 @@ ac ac Yz ac -QQ +CC Yq Yq Yq @@ -65029,29 +65030,29 @@ Yq Yq Yq Yq -QQ -QQ -QQ -QQ -QQ -QQ -QQ -QQ -QQ -QQ -QQ -QQ -QQ -QQ -QQ -QQ -QQ -QQ -QQ -QQ -QQ -QQ -QQ +CC +CC +CC +CC +CC +CC +CC +CC +CC +CC +CC +CC +CC +CC +CC +CC +CC +CC +CC +CC +CC +CC +CC Yq Yq Yq diff --git a/code/modules/mini_games/thunderdome/brawlers/outfits.dm b/code/modules/mini_games/thunderdome/brawlers/outfits.dm index eda316e1aea..573b8220866 100644 --- a/code/modules/mini_games/thunderdome/brawlers/outfits.dm +++ b/code/modules/mini_games/thunderdome/brawlers/outfits.dm @@ -9,7 +9,7 @@ uniform = /obj/item/clothing/under/misc/durathread shoes = /obj/item/clothing/shoes/combat back = /obj/item/storage/backpack/thunderdome_infinite - head = /obj/item/clothing/head/HoS + head = /obj/item/clothing/head/helmet/space/santahat /datum/outfit/thunderdome/cqc name = "Fighter" diff --git a/code/modules/mini_games/thunderdome/gamemodes/gamemode.dm b/code/modules/mini_games/thunderdome/gamemodes/gamemode.dm index e8a3c3e15a9..12e097e4459 100644 --- a/code/modules/mini_games/thunderdome/gamemodes/gamemode.dm +++ b/code/modules/mini_games/thunderdome/gamemodes/gamemode.dm @@ -53,7 +53,16 @@ /obj/item/storage/belt/grenade/frag = 1, /obj/item/storage/box/syndie_kit/dangertray = 1, /obj/item/gun/magic/hook = 1, - /obj/item/organ/internal/cyberimp/arm/katana = 1, + /obj/item/twohanded/bamboospear = 1, + /obj/item/twohanded/required/chainsaw = 1, + /obj/item/kitchen/knife/butcher/meatcleaver = 1, + /obj/item/rune_scimmy = 1, + /obj/item/twohanded/spear/bonespear/chitinspear = 1, + /obj/item/twohanded/garrote = 1, + /obj/item/melee/rapier/syndie = 1, + /obj/item/claymore/bone = 1, + /obj/item/gun/magic/staff/spellblade = 1, + /obj/item/spellbook/oneuse/goliath_dash = 1, ) @@ -65,26 +74,25 @@ brawler_type = /obj/effect/mob_spawn/human/thunderdome/ranged random_items_count = 3 item_pool = list( - /obj/item/gun/energy/immolator/multi = 1, - /obj/item/gun/projectile/automatic/mini_uzi = 1, - /obj/item/gun/projectile/automatic/pistol/deagle = 1, - /obj/item/gun/projectile/automatic/wt550 = 1, + /obj/item/gun/energy/immolator/multi = 2, + /obj/item/gun/projectile/automatic/mini_uzi = 2, + /obj/item/gun/projectile/automatic/pistol/deagle = 2, + /obj/item/gun/projectile/automatic/wt550 = 2, /obj/item/gun/projectile/automatic/l6_saw = 1, - /obj/item/gun/projectile/automatic/lasercarbine = 1, - /obj/item/gun/projectile/automatic/shotgun/bulldog = 1, - /obj/item/gun/magic/staff/slipping = 1, - /obj/item/gun/projectile/revolver/mateba = 3, + /obj/item/gun/projectile/automatic/lasercarbine = 2, + /obj/item/gun/projectile/automatic/shotgun/bulldog = 2, + /obj/item/gun/projectile/revolver/mateba = 4, /obj/item/gun/projectile/shotgun/automatic = 2, /obj/item/gun/projectile/shotgun/riot = 2, - /obj/item/gun/projectile/automatic/ak814 = 1, + /obj/item/gun/projectile/automatic/ak814 = 2, /obj/item/gun/projectile/shotgun/riot/buckshot = 3, /obj/item/gun/projectile/shotgun/boltaction = 1, /obj/item/gun/projectile/shotgun/automatic/combat = 2, - /obj/item/gun/projectile/automatic/pistol/APS = 1, + /obj/item/gun/projectile/automatic/pistol/APS = 2, /obj/item/gun/projectile/automatic/pistol/sp8/sp8ar = 1, - /obj/item/gun/projectile/automatic/pistol/m1911 = 1, - /obj/item/gun/projectile/revolver/golden = 1, - /obj/item/gun/projectile/revolver/nagant = 1, + /obj/item/gun/projectile/automatic/pistol/m1911 = 2, + /obj/item/gun/projectile/revolver/golden = 2, + /obj/item/gun/projectile/revolver/nagant = 2, /obj/item/gun/energy/gun/nuclear = 2, /obj/item/storage/box/thunderdome/bombarda = 1, /obj/item/storage/box/thunderdome/crossbow = 1, @@ -92,15 +100,34 @@ /obj/item/gun/energy/kinetic_accelerator/crossbow/large = 1, /obj/item/storage/box/thunderdome/laser_eyes = 1, /obj/item/implanter/adrenalin = 1, - /obj/item/implanter/adrenalin = 1, /obj/item/gun/projectile/automatic/sniper_rifle/syndicate = 1, - /obj/item/gun/energy/xray = 1, - /obj/item/gun/energy/lasercannon = 1, + /obj/item/gun/energy/xray = 2, + /obj/item/gun/energy/lasercannon = 2, /obj/item/clothing/mask/holo_cigar = 1, /obj/item/storage/belt/grenade/frag = 1, /obj/item/spellbook/oneuse/watchers_look = 1, /obj/item/spellbook/oneuse/fireball = 1, - /obj/item/gun/energy/emittergun = 1, + /obj/item/gun/energy/emittergun = 2, + /obj/item/gun/energy/decloner = 1, + /obj/item/gun/projectile/shotgun/automatic/dual_tube = 2, + /obj/item/gun/projectile/automatic/gyropistol = 2, + /obj/item/gun/projectile/automatic/sfg = 2, + /obj/item/gun/projectile/automatic/sp91rc = 2, + /obj/item/gun/projectile/automatic/m90 = 2, + /obj/item/gun/projectile/automatic/rusted/aksu = 2, + /obj/item/gun/projectile/automatic/rusted/ppsh = 2, + /obj/item/gun/projectile/automatic/shotgun/minotaur = 2, + /obj/item/gun/projectile/automatic/lr30 = 2, + /obj/item/gun/energy/sniperrifle = 1, + /obj/item/gun/energy/sniperrifle/pod_pilot = 1, + /obj/item/gun/energy/shock_revolver = 2, + /obj/item/gun/energy/pulse/turret = 1, + /obj/item/gun/energy/plasma_pistol = 2, + /obj/item/gun/energy/laser/scatter = 2, + /obj/item/gun/energy/bsg/prebuilt = 1, + /obj/item/gun/magic/staff/spellblade = 1, + /obj/item/spellbook/oneuse/goliath_dash = 1, + /obj/item/spellbook/oneuse/forcewall = 1, ) /datum/thunderdome_gamemode/mixed @@ -174,5 +201,32 @@ /obj/item/spellbook/oneuse/fireball = 1, /obj/item/gun/energy/emittergun = 1, /obj/item/gun/magic/hook = 1, - /obj/item/organ/internal/cyberimp/arm/katana = 1, + /obj/item/gun/energy/decloner = 1, + /obj/item/gun/projectile/shotgun/automatic/dual_tube = 2, + /obj/item/gun/projectile/automatic/gyropistol = 1, + /obj/item/gun/projectile/automatic/sfg = 1, + /obj/item/gun/projectile/automatic/sp91rc = 1, + /obj/item/gun/projectile/automatic/m90 = 1, + /obj/item/gun/projectile/automatic/rusted/aksu = 1, + /obj/item/gun/projectile/automatic/rusted/ppsh = 1, + /obj/item/gun/projectile/automatic/shotgun/minotaur = 1, + /obj/item/gun/projectile/automatic/lr30 = 1, + /obj/item/gun/energy/sniperrifle = 1, + /obj/item/gun/energy/sniperrifle/pod_pilot = 1, + /obj/item/gun/energy/shock_revolver = 1, + /obj/item/gun/energy/pulse/turret = 1, + /obj/item/gun/energy/plasma_pistol = 1, + /obj/item/gun/energy/laser/scatter = 1, + /obj/item/gun/energy/bsg/prebuilt = 1, + /obj/item/twohanded/bamboospear = 1, + /obj/item/twohanded/required/chainsaw = 1, + /obj/item/kitchen/knife/butcher/meatcleaver = 1, + /obj/item/rune_scimmy = 1, + /obj/item/twohanded/spear/bonespear/chitinspear = 1, + /obj/item/twohanded/garrote = 1, + /obj/item/melee/rapier/syndie = 1, + /obj/item/claymore/bone = 1, + /obj/item/gun/magic/staff/spellblade = 1, + /obj/item/spellbook/oneuse/goliath_dash = 1, + /obj/item/spellbook/oneuse/forcewall = 1, )