Skip to content

Commit

Permalink
Merge pull request Civ13#2626 from Bierkraan/working-branch
Browse files Browse the repository at this point in the history
Update broken icons
  • Loading branch information
Bierkraan authored Mar 2, 2024
2 parents 8100705 + 9c489cb commit 220cb0f
Show file tree
Hide file tree
Showing 146 changed files with 695 additions and 640 deletions.
1 change: 1 addition & 0 deletions code/__defines/maps.dm
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@
#define MAP_ARCTIC_SUB "ARCTIC_SUB"
#define MAP_NATIONSRP_COLDWAR "NATIONSRP_COLDWAR"
#define MAP_NATIONSRP_COLDWAR_CAMPAIGN "NATIONSRP_COLDWAR_CAMPAIGN"
#define MAP_CZECH_BORDER "CZECH_BORDER"

#define MAP_HOSTAGES "HOSTAGES"
#define MAP_ARAB_TOWN "ARAB_TOWN"
Expand Down
2 changes: 1 addition & 1 deletion code/game/mob/living/carbon/human/human_helpers.dm
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@
var/obj/structure/vehicleparts/frame/found = null

for (var/image/tmpimg in client.images)
if (tmpimg.icon == 'icons/obj/vehicles/vehicleparts.dmi' || tmpimg.icon == 'icons/obj/vehicles/vehicles96x96.dmi' || tmpimg.icon == 'icons/obj/vehicles/vehicles128x128.dmi' || tmpimg.icon == 'icons/obj/vehicles/vehicles256x256.dmi' || tmpimg.icon == 'icons/obj/vehicles/apcparts.dmi' || tmpimg.icon == 'icons/obj/vehicles/tankparts.dmi')
if (tmpimg.icon == 'icons/obj/vehicles/vehicleparts.dmi' || tmpimg.icon == 'icons/obj/vehicles/vehicleparts_damaged.dmi' || tmpimg.icon == 'icons/obj/vehicles/apcparts.dmi' || tmpimg.icon == 'icons/obj/vehicles/apcparts96x96.dmi' || tmpimg.icon == 'icons/obj/vehicles/tankparts.dmi' || tmpimg.icon == 'icons/obj/vehicles/tankparts96x96.dmi' || tmpimg.icon == 'icons/obj/vehicles/vehicleparts64x64.dmi' || tmpimg.icon == 'icons/obj/vehicles/vehicles96x96.dmi' || tmpimg.icon == 'icons/obj/vehicles/vehicles128x128.dmi' || tmpimg.icon == 'icons/obj/vehicles/vehicles256x256.dmi')
client.images.Remove(tmpimg)
for (var/obj/structure/vehicleparts/frame/FRL in loc) // Check if we're standing a frame
found = FRL
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/map_metadata/2Fort.dm
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/obj/map_metadata/camp
ID = MAP_CAMP
title = "Camp"
lobby_icon = "icons/lobby/medieval.png"
lobby_icon = 'icons/lobby/medieval.png'
caribbean_blocking_area_types = list(/area/caribbean/no_mans_land/invisible_wall/)
respawn_delay = 0
has_hunger = TRUE
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/map_metadata/_map_metadata.dm
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ var/civmax_research = list(230,230,230)
var/ID = null // MUST be text, or aspects will break
var/no_winner = "Neither side has captured the other side's base."
var/title = null
var/lobby_icon = "icons/lobby/civ13.gif"
var/lobby_icon = 'icons/lobby/civ13.gif'
var/list/caribbean_blocking_area_types = list()
var/list/allow_bullets_through_blocks = list()
var/last_crossing_block_status[3]
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/map_metadata/abashiri.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
ID = MAP_ABASHIRI
title = "Abashiri Prison"
no_winner ="The round is proceeding normally."
lobby_icon = "icons/lobby/abashiri.png"
lobby_icon = 'icons/lobby/abashiri.png'
caribbean_blocking_area_types = list(/area/caribbean/no_mans_land/invisible_wall)
respawn_delay = 3600
has_hunger = TRUE
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/map_metadata/african_warlords.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/obj/map_metadata/african_warlords
ID = MAP_AFRICAN_WARLORDS
title = "African Warlords"
lobby_icon = "icons/lobby/africanwarlords.png"
lobby_icon = 'icons/lobby/africanwarlords.png'
caribbean_blocking_area_types = list(/area/caribbean/no_mans_land/invisible_wall/jungle,/area/caribbean/no_mans_land/invisible_wall/jungle/one,/area/caribbean/no_mans_land/invisible_wall/jungle/two,/area/caribbean/no_mans_land/invisible_wall/jungle/three)
respawn_delay = 300
no_winner ="No warband has won yet."
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/map_metadata/alleyway.dm
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/obj/map_metadata/alleyway
ID = MAP_ALLEYWAY
title = "Alleyway"
lobby_icon = "icons/lobby/alleyway.png"
lobby_icon = 'icons/lobby/alleyway.png'
caribbean_blocking_area_types = list(/area/caribbean/no_mans_land/invisible_wall/jungle, /area/caribbean/no_mans_land/invisible_wall/inside, /area/caribbean/no_mans_land/invisible_wall/inside/one, /area/caribbean/no_mans_land/invisible_wall/inside/two)
respawn_delay = 300
no_winner ="The fighting for the street is still going on."
Expand Down
4 changes: 2 additions & 2 deletions code/game/objects/map_metadata/arab_town.dm
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/obj/map_metadata/arab_town
ID = MAP_ARAB_TOWN
title = "Arab Town"
lobby_icon = "icons/lobby/modern.png"
lobby_icon = 'icons/lobby/modern.png'
caribbean_blocking_area_types = list(/area/caribbean/no_mans_land/invisible_wall/desert)
respawn_delay = 1200
no_winner = "The operation is still underway."
Expand Down Expand Up @@ -154,7 +154,7 @@ var/no_loop_arab = FALSE
/obj/map_metadata/arab_town_2
ID = MAP_ARAB_TOWN_2
title = "Arab Town II"
lobby_icon = "icons/lobby/modern.png"
lobby_icon = 'icons/lobby/modern.png'
caribbean_blocking_area_types = list(/area/caribbean/no_mans_land/invisible_wall/desert)
respawn_delay = 1200

Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/map_metadata/ardennes.dm
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/obj/map_metadata/ardennes
ID = MAP_ARDENNES
title = "Ardennes Offensive"
lobby_icon = "icons/lobby/ardennes.png"
lobby_icon = 'icons/lobby/ardennes.png'
caribbean_blocking_area_types = list(/area/caribbean/no_mans_land/invisible_wall/tundra/three,/area/caribbean/no_mans_land/invisible_wall/tundra/two,/area/caribbean/no_mans_land/invisible_wall/tundra/one)
respawn_delay = 1200
no_winner = "The HQ stays under American control, stalling the German offense."
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/map_metadata/bank_robbery.dm
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/obj/map_metadata/bank_robbery
ID = MAP_BANK_ROBBERY
title = "The Goldstein Bank Heist"
lobby_icon = "icons/lobby/bank_robbery.png"
lobby_icon = 'icons/lobby/bank_robbery.png'
no_winner ="The robbery is still underway."
caribbean_blocking_area_types = list(
/area/caribbean/no_mans_land/invisible_wall,
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/map_metadata/barbarossa.dm
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/obj/map_metadata/barbarossa
ID = MAP_BARBAROSSA
title = "Start of operation Barbarossa"
lobby_icon = "icons/lobby/barbarossa.png"
lobby_icon = 'icons/lobby/barbarossa.png'
caribbean_blocking_area_types = list(/area/caribbean/no_mans_land/invisible_wall,/area/caribbean/no_mans_land/invisible_wall/two)
respawn_delay = 1200
no_winner ="The Border stays under Soviet control, stalling the German advance."
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/map_metadata/battle_ships.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
ID = MAP_BATTLE_SHIPS
title = "Battle Ships"
no_winner = "The battle is still going on."
lobby_icon = "icons/lobby/battleships.png"
lobby_icon = 'icons/lobby/battleships.png'
caribbean_blocking_area_types = list(/area/caribbean/no_mans_land/invisible_wall, /area/caribbean/no_mans_land/invisible_wall/sea)
faction_organization = list(
PIRATES,
Expand Down
4 changes: 2 additions & 2 deletions code/game/objects/map_metadata/battleroyale.dm
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/obj/map_metadata/battleroyale
ID = MAP_BATTLEROYALE_IMPERIAL
title = "Battle Royale: Imperial"
lobby_icon = "icons/lobby/battleroyale.png"
lobby_icon = 'icons/lobby/battleroyale.png'
caribbean_blocking_area_types = list(/area/caribbean/no_mans_land/invisible_wall)
respawn_delay = 0
is_singlefaction = TRUE
Expand Down Expand Up @@ -473,7 +473,7 @@
/obj/map_metadata/battleroyale/two
ID = MAP_BATTLEROYALE_MODERN
title = "Battle Royale: Modern"
lobby_icon = "icons/lobby/battleroyale_arab.png"
lobby_icon = 'icons/lobby/battleroyale_arab.png'

age = "2013"
ordinal_age = 8
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/map_metadata/berlin.dm
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/obj/map_metadata/berlin
ID = MAP_BERLIN
title = "Berlin"
lobby_icon = "icons/lobby/ww2.png"
lobby_icon = 'icons/lobby/ww2.png'
caribbean_blocking_area_types = list(/area/caribbean/no_mans_land/invisible_wall)
respawn_delay = 1200
no_winner ="The Branderburg Gate is under German control."
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/map_metadata/bohemia.dm
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/obj/map_metadata/bohemia
ID = MAP_BOHEMIA
title = "Bohemia"
lobby_icon = "icons/lobby/medieval.png"
lobby_icon = 'icons/lobby/medieval.png'
no_winner ="The round is proceeding normally."
caribbean_blocking_area_types = list(/area/caribbean/no_mans_land/invisible_wall/)
respawn_delay = 7200 // 12 minutes!
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/map_metadata/caloocan.dm
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/obj/map_metadata/caloocan
ID = MAP_CALOOCAN
title = "Caloocan"
lobby_icon = "icons/lobby/ph_us_war.png"
lobby_icon = 'icons/lobby/ph_us_war.png'
no_winner ="The church is under Filipino control."
caribbean_blocking_area_types = list(/area/caribbean/no_mans_land/invisible_wall,/area/caribbean/no_mans_land/invisible_wall/one,/area/caribbean/no_mans_land/invisible_wall/two)
respawn_delay = 600
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/map_metadata/camp.dm
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/obj/map_metadata/camp
ID = MAP_CAMP
title = "Camp"
lobby_icon = "icons/lobby/medieval.png"
lobby_icon = 'icons/lobby/medieval.png'
caribbean_blocking_area_types = list(/area/caribbean/no_mans_land/invisible_wall,/area/caribbean/no_mans_land/invisible_wall/one,/area/caribbean/no_mans_land/invisible_wall/two)
respawn_delay = 0
victory_time = 15000
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/map_metadata/campaign.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/obj/map_metadata/campaign
ID = MAP_CAMPAIGN
title = "Campaign"
lobby_icon = "icons/lobby/campaign.png"
lobby_icon = 'icons/lobby/campaign.png'
caribbean_blocking_area_types = list(/area/caribbean/no_mans_land/invisible_wall,/area/caribbean/no_mans_land/invisible_wall/temperate)
respawn_delay = 1800
no_winner = "The battle is going on."
Expand Down
4 changes: 2 additions & 2 deletions code/game/objects/map_metadata/capitol_hill.dm
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/obj/map_metadata/capitol_hill
ID = MAP_CAPITOL_HILL
title = "Capitol Hill"
lobby_icon = "icons/lobby/capitol.png"
lobby_icon = 'icons/lobby/capitol.png'
caribbean_blocking_area_types = list(/area/caribbean/no_mans_land/invisible_wall,/area/caribbean/no_mans_land/invisible_wall/one,/area/caribbean/no_mans_land/invisible_wall/two)
respawn_delay = 1200
no_winner = "The operation is still underway."
Expand Down Expand Up @@ -305,7 +305,7 @@ var/no_loop_capitol = FALSE
/obj/map_metadata/capitol_hill/pla_offensive
ID = MAP_CAPITOL_HILL_PLA
title = "PLA Offensive on the Capitol Hill"
lobby_icon = "icons/lobby/capitolchina.png"
lobby_icon = 'icons/lobby/capitolchina.png'
caribbean_blocking_area_types = list(/area/caribbean/no_mans_land/invisible_wall,/area/caribbean/no_mans_land/invisible_wall/one,/area/caribbean/no_mans_land/invisible_wall/two)
respawn_delay = 600
no_winner = "The operation is still underway."
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/map_metadata/chad_jungle.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/obj/map_metadata/chad_jungle
ID = MAP_JUNGLE_OF_THE_CHADS
title = "JUNGLE OF THE CHADS"
lobby_icon = "icons/lobby/civ13.gif"
lobby_icon = 'icons/lobby/civ13.gif'
no_winner ="The round is proceeding normally."
caribbean_blocking_area_types = list(/area/caribbean/no_mans_land/invisible_wall/)
respawn_delay = 6000 // 10 minutes!
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/map_metadata/civilizations.dm
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/obj/map_metadata/civilizations
ID = MAP_CIVILIZATIONS
title = "Two Kingdoms"
lobby_icon = "icons/lobby/civ13.gif"
lobby_icon = 'icons/lobby/civ13.gif'
caribbean_blocking_area_types = list(/area/caribbean/no_mans_land/invisible_wall/)
respawn_delay = 6000 // 10 minutes!
has_hunger = TRUE
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/map_metadata/clash.dm
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/obj/map_metadata/clash
ID = MAP_CLASH
title = "Clash"
lobby_icon = "icons/lobby/clash.png"
lobby_icon = 'icons/lobby/clash.png'
caribbean_blocking_area_types = list(/area/caribbean/no_mans_land/invisible_wall/)
victory_time = 21600
no_winner = "The settlement is still held by the Raven Clan."
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/map_metadata/colony.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/obj/map_metadata/colony
ID = MAP_COLONY
title = "Colony"
lobby_icon = "icons/lobby/imperial.png"
lobby_icon = 'icons/lobby/imperial.png'
no_winner ="The round is proceeding normally."
caribbean_blocking_area_types = list(/area/caribbean/no_mans_land/invisible_wall/)
respawn_delay = 7200 // 12 minutes!
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/map_metadata/compound.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/obj/map_metadata/compound
ID = MAP_COMPOUND
title = "Compound"
lobby_icon = "icons/lobby/vietnam.png"
lobby_icon = 'icons/lobby/vietnam.png'
caribbean_blocking_area_types = list(/area/caribbean/no_mans_land/invisible_wall,/area/caribbean/no_mans_land/invisible_wall/one,/area/caribbean/no_mans_land/invisible_wall/two)
respawn_delay = 300
no_winner ="No base has been captured."
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/map_metadata/cursed_island.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/obj/map_metadata/cursed_island
ID = MAP_CURSED_ISLAND
title = "Cursed Island"
lobby_icon = "icons/lobby/cursed.png"
lobby_icon = 'icons/lobby/cursed.png'
caribbean_blocking_area_types = list(/area/caribbean/no_mans_land/invisible_wall,
/area/caribbean/no_mans_land/invisible_wall/inside)
respawn_delay = 0
Expand Down
4 changes: 2 additions & 2 deletions code/game/objects/map_metadata/czech_border.dm
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@

/obj/map_metadata/czech_border
ID = MAP_czech_border
ID = MAP_CZECH_BORDER
title = "Battle On the Czech border"
lobby_icon = "icons/lobby/ "
lobby_icon = 'icons/lobby/modern.png'
caribbean_blocking_area_types = list(/area/caribbean/no_mans_land/invisible_wall/temperate,/area/caribbean/no_mans_land/invisible_wall/temperate/one,/area/caribbean/no_mans_land/invisible_wall/temperate/one)
respawn_delay = 1200
no_winner ="The Village is under Czech control."
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/map_metadata/drug_bust.dm
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/obj/map_metadata/drug_bust
ID = MAP_DRUG_BUST
title = "The Rednikov Drug Bust"
lobby_icon = "icons/lobby/policestories.png"
lobby_icon = 'icons/lobby/policestories.png'
no_winner ="The drug bust is still underway."
caribbean_blocking_area_types = list(
/area/caribbean/no_mans_land/invisible_wall,
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/map_metadata/east_los_santos.dm
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/obj/map_metadata/east_los_santos
ID = MAP_EAST_LOS_SANTOS
title = "East Los Santos"
lobby_icon = "icons/lobby/east_los_santos.png"
lobby_icon = 'icons/lobby/east_los_santos.png'
no_winner = "The fight for the hood is still going on."
caribbean_blocking_area_types = list(/area/caribbean/no_mans_land/invisible_wall, /area/caribbean/no_mans_land/invisible_wall/one, /area/caribbean/no_mans_land/invisible_wall/two)
respawn_delay = 0
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/map_metadata/eft_factory.dm
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/obj/map_metadata/eft_factory
ID = MAP_EFT_FACTORY
title = "Factory"
lobby_icon = "icons/lobby/battleroyale.png"
lobby_icon = 'icons/lobby/battleroyale.png'
caribbean_blocking_area_types = list(/area/caribbean/no_mans_land/invisible_wall)
respawn_delay = 3000

Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/map_metadata/elaia.dm
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/obj/map_metadata/elaia
ID = MAP_ELAIA
title = "Elaia"
lobby_icon = "icons/lobby/ww2.png"
lobby_icon = 'icons/lobby/ww2.png'
caribbean_blocking_area_types = list(/area/caribbean/no_mans_land/invisible_wall,/area/caribbean/no_mans_land/invisible_wall/one,/area/caribbean/no_mans_land/invisible_wall/two)
respawn_delay = 0
no_hardcore = TRUE
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/map_metadata/event_city.dm
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/obj/map_metadata/event_city
ID = MAP_EVENT_CITY
title = "event city"
lobby_icon = "icons/lobby/civ13.gif"
lobby_icon = 'icons/lobby/civ13.gif'
caribbean_blocking_area_types = list(/area/caribbean/no_mans_land/invisible_wall)
respawn_delay = 0
is_singlefaction = TRUE
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/map_metadata/fallujah.dm
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/obj/map_metadata/fallujah
ID = MAP_FALLUJAH
title = "Fallujah"
lobby_icon = "icons/lobby/fallujah.png"
lobby_icon = 'icons/lobby/fallujah.png'
caribbean_blocking_area_types = list(/area/caribbean/no_mans_land/invisible_wall/desert)
respawn_delay = 1200
no_winner = "The operation is still underway."
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/map_metadata/fields.dm
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/obj/map_metadata/fields
ID = MAP_FIELDS
title = "Fields"
lobby_icon = "icons/lobby/imperial.png"
lobby_icon = 'icons/lobby/imperial.png'
caribbean_blocking_area_types = list(/area/caribbean/no_mans_land/invisible_wall/)
respawn_delay = 300

Expand Down
4 changes: 2 additions & 2 deletions code/game/objects/map_metadata/football.dm
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/obj/map_metadata/football
ID = MAP_FOOTBALL
title = "Football Match"
lobby_icon = "icons/lobby/football.png"
lobby_icon = 'icons/lobby/football.png'
caribbean_blocking_area_types = list(/area/caribbean/football/midfield, /area/caribbean/football/nopass)
respawn_delay = 0
no_winner ="The game is still going on."
Expand Down Expand Up @@ -329,7 +329,7 @@
/obj/map_metadata/football_campaign
ID = MAP_FOOTBALL_CAMPAIGN
title = "Football Match"
lobby_icon = "icons/lobby/football.png"
lobby_icon = 'icons/lobby/football.png'
caribbean_blocking_area_types = list(/area/caribbean/football/midfield, /area/caribbean/football/nopass)
respawn_delay = 0
no_winner ="The game is still going on."
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/map_metadata/forest.dm
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/obj/map_metadata/forest
ID = MAP_FOREST
title = "Forest"
lobby_icon = "icons/lobby/ww2.png"
lobby_icon = 'icons/lobby/ww2.png'
no_winner ="The battle for the city is still going on."
caribbean_blocking_area_types = list(/area/caribbean/no_mans_land/invisible_wall,/area/caribbean/no_mans_land/invisible_wall/not_dynamic, /area/caribbean/no_mans_land/invisible_wall/one, /area/caribbean/no_mans_land/invisible_wall/two)
respawn_delay = 300
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/map_metadata/four_colonies.dm
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/obj/map_metadata/four_colonies
ID = MAP_FOUR_COLONIES
title = "Four Colonies"
lobby_icon = "icons/lobby/imperial.png"
lobby_icon = 'icons/lobby/imperial.png'
no_winner ="The round is proceeding normally."
caribbean_blocking_area_types = list(/area/caribbean/no_mans_land/invisible_wall/)
respawn_delay = 7200 // 12 minutes!
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/map_metadata/four_kingdoms.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
ID = MAP_FOUR_KINGDOMS
title = "Four Kingdoms"
no_winner ="The round is proceeding normally."
lobby_icon = "icons/lobby/fantasy.png"
lobby_icon = 'icons/lobby/fantasy.png'
caribbean_blocking_area_types = list(/area/caribbean/no_mans_land/invisible_wall/jungle,/area/caribbean/no_mans_land/invisible_wall/temperate,/area/caribbean/no_mans_land/invisible_wall/desert,/area/caribbean/no_mans_land/invisible_wall/semiarid,/area/caribbean/no_mans_land/invisible_wall/taiga,/area/caribbean/no_mans_land/invisible_wall/tundra,/area/caribbean/no_mans_land/invisible_wall)
respawn_delay = 3600 // 6 minutes!
force_mapgen = TRUE
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/map_metadata/gladiators.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ K
/obj/map_metadata/gladiators
ID = MAP_GLADIATORS
title = "Gladiators"
lobby_icon = "icons/lobby/gladiators.png"
lobby_icon = 'icons/lobby/gladiators.png'
caribbean_blocking_area_types = list(/area/caribbean/no_mans_land/invisible_wall/one, /area/caribbean/no_mans_land/invisible_wall/two,/area/caribbean/no_mans_land/invisible_wall/three,/area/caribbean/no_mans_land/invisible_wall/four)
respawn_delay = 0

Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/map_metadata/grozny.dm
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/obj/map_metadata/grozny
ID = MAP_GROZNY
title = "Retreat From Grozny"
lobby_icon = "icons/lobby/grozny.png"
lobby_icon = 'icons/lobby/grozny.png'
caribbean_blocking_area_types = list(/area/caribbean/no_mans_land/invisible_wall,/area/caribbean/no_mans_land/invisible_wall/one,/area/caribbean/no_mans_land/invisible_wall/two)
respawn_delay = 1200
no_hardcore = TRUE
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/map_metadata/gulag13.dm
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
ID = MAP_GULAG13
title = "GULAG 13"
no_winner ="The round is proceeding normally."
lobby_icon = "icons/lobby/gulag.png"
lobby_icon = 'icons/lobby/gulag.png'
caribbean_blocking_area_types = list(/area/caribbean/no_mans_land/invisible_wall/tundra, /area/caribbean/no_mans_land/invisible_wall/one)
respawn_delay = 3600
has_hunger = TRUE
Expand Down
Loading

0 comments on commit 220cb0f

Please sign in to comment.