diff --git a/code/datums/ammo/bullet/shotgun.dm b/code/datums/ammo/bullet/shotgun.dm index ccebda8c51..9504e3c1d1 100644 --- a/code/datums/ammo/bullet/shotgun.dm +++ b/code/datums/ammo/bullet/shotgun.dm @@ -159,7 +159,7 @@ accurate_range = 8 max_range = 8 - damage = 140 + damage = 90 penetration = ARMOR_PENETRATION_TIER_4 bonus_projectiles_amount = EXTRA_PROJECTILES_TIER_6 firing_freq_offset = SOUND_FREQ_LOW @@ -195,7 +195,7 @@ accurate_range = 8 max_range = 8 - damage = 140 + damage = 90 penetration = ARMOR_PENETRATION_TIER_4 firing_freq_offset = SOUND_FREQ_LOW diff --git a/code/modules/admin/game_master/game_master_submenu/vents.dm b/code/modules/admin/game_master/game_master_submenu/vents.dm index 57d3064aa5..937dc7c5ff 100644 --- a/code/modules/admin/game_master/game_master_submenu/vents.dm +++ b/code/modules/admin/game_master/game_master_submenu/vents.dm @@ -45,22 +45,21 @@ var/list/data = list() + data["xeno_spawn_count"] = xeno_spawn_count + data["selected_xeno"] = selected_xeno data["ambush_info"] = ambush_info return data - /datum/game_master_submenu/vents/ui_static_data(mob/user) . = ..() var/list/data = list() - data["default_spawnable_xeno_string"] = DEFAULT_SPAWN_XENO_STRING data["spawnable_xenos"] = GAME_MASTER_VENT_AI_XENOS return data - /datum/game_master_submenu/vents/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) . = ..() diff --git a/interface/skin.dmf b/interface/skin.dmf index a3c42ebf00..48aa3d0d7c 100644 --- a/interface/skin.dmf +++ b/interface/skin.dmf @@ -292,7 +292,9 @@ window "infowindow" anchor1 = 66,0 anchor2 = 97,0 background-color = #7289da - font-size = 26px + font-size = 22px + font-family = "Arial" + text-align = center saved-params = "is-checked" text = "discord.gg/v6P6wns5dN" command = "discord" diff --git a/tgui/packages/tgui/interfaces/GameMasterSubmenuVents.js b/tgui/packages/tgui/interfaces/GameMasterSubmenuVents.js index 792362d62f..f068ffa746 100644 --- a/tgui/packages/tgui/interfaces/GameMasterSubmenuVents.js +++ b/tgui/packages/tgui/interfaces/GameMasterSubmenuVents.js @@ -13,9 +13,10 @@ export const GameMasterSubmenuVents = (props, context) => { { act('set_xeno_spawns', { value }); }} @@ -24,7 +25,7 @@ export const GameMasterSubmenuVents = (props, context) => { { act('set_selected_xeno', { new_xeno }); }}