cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 19:52:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into upstream-merge-10213

Browse Source
This commit is contained in:
Nadyr
2021-04-30 01:03:17 -04:00
committed by GitHub
parent e8e635184c 1930a85c2c
commit a34fd9cec8
31 changed files with 238 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/game/machinery/suit_storage_unit.dm
View File

@@ -634,10 +634,6 @@
model_text = "Exploration"
departments = list("Exploration","Expedition Medic","Old Exploration","No Change")
/obj/machinery/suit_cycler/exploration/Initialize()
species -= SPECIES_TESHARI
return ..()
/obj/machinery/suit_cycler/pilot
name = "Pilot suit cycler"
model_text = "Pilot"

8
code/modules/client/preference_setup/loadout/loadout.dm
View File

@@ -66,18 +66,10 @@ var/list/gear_datums = list()
for(var/gear_name in gear_datums)
var/datum/gear/G = gear_datums[gear_name]
<<<<<<< HEAD
if(G.whitelisted && !is_alien_whitelisted(preference_mob, GLOB.all_species[G.whitelisted]))
continue
||||||| parent of a8185bde6e... Merge pull request #10213 from Heroman3003/fixforw
if(G.whitelisted != pref.species)
continue
=======
//VOREStation Removal Start - No need for species-based whitelists for species clothes
//if(G.whitelisted && G.whitelisted != pref.species)
// continue
//VOREStation Removal End
>>>>>>> a8185bde6e... Merge pull request #10213 from Heroman3003/fixforw
if(max_cost && G.cost > max_cost)
continue
//VOREStation Edit Start

4
code/modules/clothing/suits/utility_vr.dm
View File

@@ -19,14 +19,14 @@
/obj/item/clothing/head/radiation
sprite_sheets = list(
SPECIES_TESHARI = 'icons/mob/species/teshari/helmet_vr.dmi',
SPECIES_TESHARI = 'icons/mob/species/teshari/head_ch.dmi', //CHOMPstation edit, using our overwrite icons
SPECIES_VOX = 'icons/mob/species/vox/head.dmi',
SPECIES_WEREBEAST = 'icons/mob/species/werebeast/head.dmi'
)
/obj/item/clothing/suit/radiation
sprite_sheets = list(
SPECIES_TESHARI = 'icons/mob/species/teshari/suit_vr.dmi',
SPECIES_TESHARI = 'icons/mob/species/teshari/suit_ch.dmi', //CHOMPstation edit, using our overwrite icons
SPECIES_VOX = 'icons/mob/species/vox/suit.dmi',
SPECIES_WEREBEAST = 'icons/mob/species/werebeast/suit.dmi'
)

205
code/modules/food/food/drinks/bottle.dm
View File

@@ -341,20 +341,20 @@
. = ..()
reagents.add_reagent("absinthe", 100)
/obj/item/weapon/reagent_containers/food/drinks/bottle/melonliquor
name = "Emeraldine Melon Liquor"
/obj/item/weapon/reagent_containers/food/drinks/bottle/melonliquor //MODIFIED ON 04/21/2021
name = "Emeraldine Melon Liqueur"
desc = "A bottle of 46 proof Emeraldine Melon Liquor. Sweet and light."
icon_state = "alco-green" //Placeholder.
icon_state = "melon_liqueur"
center_of_mass = list("x"=16, "y"=6)
/obj/item/weapon/reagent_containers/food/drinks/bottle/melonliquor/Initialize()
. = ..()
reagents.add_reagent("melonliquor", 100)
/obj/item/weapon/reagent_containers/food/drinks/bottle/bluecuracao
/obj/item/weapon/reagent_containers/food/drinks/bottle/bluecuracao //MODIFIED ON 04/21/2021
name = "Miss Blue Curacao"
desc = "A fruity, exceptionally azure drink. Does not allow the imbiber to use the fifth magic."
icon_state = "alco-blue" //Placeholder.
icon_state = "blue_curacao"
center_of_mass = list("x"=16, "y"=6)
/obj/item/weapon/reagent_containers/food/drinks/bottle/bluecuracao/Initialize()
@@ -371,36 +371,6 @@
. = ..()
reagents.add_reagent("grenadine", 100)
/obj/item/weapon/reagent_containers/food/drinks/bottle/cola
name = "\improper Space Cola"
desc = "Cola. in space"
icon_state = "colabottle"
center_of_mass = list("x"=16, "y"=6)
/obj/item/weapon/reagent_containers/food/drinks/bottle/cola/Initialize()
. = ..()
reagents.add_reagent("cola", 100)
/obj/item/weapon/reagent_containers/food/drinks/bottle/space_up
name = "\improper Space-Up"
desc = "Tastes like a hull breach in your mouth."
icon_state = "space-up_bottle"
center_of_mass = list("x"=16, "y"=6)
/obj/item/weapon/reagent_containers/food/drinks/bottle/space_up/Initialize()
. = ..()
reagents.add_reagent("space_up", 100)
/obj/item/weapon/reagent_containers/food/drinks/bottle/space_mountain_wind
name = "\improper Space Mountain Wind"
desc = "Blows right through you like a space wind."
icon_state = "space_mountain_wind_bottle"
center_of_mass = list("x"=16, "y"=6)
/obj/item/weapon/reagent_containers/food/drinks/bottle/space_mountain_wind/Initialize()
. = ..()
reagents.add_reagent("spacemountainwind", 100)
/obj/item/weapon/reagent_containers/food/drinks/bottle/pwine
name = "Warlock's Velvet"
desc = "What a delightful packaging for a surely high quality wine! The vintage must be amazing!"
@@ -421,7 +391,107 @@
. = ..()
reagents.add_reagent("unathiliquor", 100)
//////////////////////////JUICES AND STUFF ///////////////////////
/obj/item/weapon/reagent_containers/food/drinks/bottle/sake
name = "Mono-No-Aware Luxury Sake"
desc = "Dry alcohol made from rice, a favorite of businessmen."
icon_state = "sakebottle"
center_of_mass = list("x"=16, "y"=3)
/obj/item/weapon/reagent_containers/food/drinks/bottle/sake/Initialize()
. = ..()
reagents.add_reagent("sake", 100)
/obj/item/weapon/reagent_containers/food/drinks/bottle/champagne
name = "Gilthari Luxury Champagne"
desc = "For those special occassions."
icon_state = "champagne"
center_of_mass = list("x"=16, "y"=3)
/obj/item/weapon/reagent_containers/food/drinks/bottle/champagne/Initialize()
. = ..()
reagents.add_reagent("champagne", 100)
/obj/item/weapon/reagent_containers/food/drinks/bottle/peppermintschnapps
name = "Dr. Bone's Peppermint Schnapps"
desc = "A flavoured grain liqueur with a fresh, minty taste."
icon_state = "schnapps_pep"
center_of_mass = list("x"=16, "y"=3)
/obj/item/weapon/reagent_containers/food/drinks/bottle/peppermintschnapps/Initialize()
. = ..()
reagents.add_reagent("schnapps_pep", 100)
/obj/item/weapon/reagent_containers/food/drinks/bottle/peachschnapps
name = "Dr. Bone's Peach Schnapps"
desc = "A flavoured grain liqueur with a fruity peach taste."
icon_state = "schnapps_pea"
center_of_mass = list("x"=16, "y"=3)
/obj/item/weapon/reagent_containers/food/drinks/bottle/peachschnapps/Initialize()
. = ..()
reagents.add_reagent("schnapps_pea", 100)
/obj/item/weapon/reagent_containers/food/drinks/bottle/lemonadeschnapps
name = "Dr. Bone's Lemonade Schnapps"
desc = "A flavoured grain liqueur with a sweetish, lemon taste."
icon_state = "schnapps_lem"
center_of_mass = list("x"=16, "y"=3)
/obj/item/weapon/reagent_containers/food/drinks/bottle/lemonadeschnapps/Initialize()
. = ..()
reagents.add_reagent("schnapps_lem", 100)
/obj/item/weapon/reagent_containers/food/drinks/bottle/jager
name = "Schusskonig"
desc = "A complex tasting digestif. Thank god the original's trademark lapsed."
icon_state = "jager_bottle"
center_of_mass = list("x"=16, "y"=3)
/obj/item/weapon/reagent_containers/food/drinks/bottle/jager/Initialize()
. = ..()
reagents.add_reagent("jager", 100)
//////////////////////////JUICES AND STUFF///////////////////////
/obj/item/weapon/reagent_containers/food/drinks/bottle/cola //MODIFIED ON 04/21/2021
name = "\improper two-liter Space Cola"
desc = "Cola. In space."
icon_state = "colabottle"
center_of_mass = list("x"=16, "y"=6)
/obj/item/weapon/reagent_containers/food/drinks/bottle/cola/Initialize()
. = ..()
reagents.add_reagent("cola", 100)
/obj/item/weapon/reagent_containers/food/drinks/bottle/space_up //MODIFIED ON 04/21/2021
name = "\improper two-liter Space-Up"
desc = "Tastes like a hull breach in your mouth."
icon_state = "space-up_bottle"
center_of_mass = list("x"=16, "y"=6)
/obj/item/weapon/reagent_containers/food/drinks/bottle/space_up/Initialize()
. = ..()
reagents.add_reagent("space_up", 100)
/obj/item/weapon/reagent_containers/food/drinks/bottle/space_mountain_wind //MODIFIED ON 04/21/2021
name = "\improper two-liter Space Mountain Wind"
desc = "Blows right through you like a space wind."
icon_state = "space_mountain_wind_bottle"
center_of_mass = list("x"=16, "y"=6)
/obj/item/weapon/reagent_containers/food/drinks/bottle/space_mountain_wind/Initialize()
. = ..()
reagents.add_reagent("spacemountainwind", 100)
/obj/item/weapon/reagent_containers/food/drinks/bottle/dr_gibb //ADDED ON 04/21/2021
name = "\improper two-liter Dr. Gibb"
desc = "A delicious mixture of 42 different flavors."
icon_state = "dr_gibb_bottle"
center_of_mass = list("x"=16, "y"=6)
/obj/item/weapon/reagent_containers/food/drinks/bottle/dr_gibb/Initialize()
. = ..()
reagents.add_reagent("dr_gibb", 100)
/obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice
name = "Orange Juice"
@@ -507,7 +577,8 @@
. = ..()
reagents.add_reagent("lemonjuice", 100)
//Small bottles
//////////////////////////SMALL BOTTLES///////////////////////
/obj/item/weapon/reagent_containers/food/drinks/bottle/small
volume = 50
smash_duration = 1
@@ -578,63 +649,3 @@
/obj/item/weapon/reagent_containers/food/drinks/bottle/small/ale/hushedwhisper/Initialize()
. = ..()
reagents.add_reagent("ale", 50)
/obj/item/weapon/reagent_containers/food/drinks/bottle/sake
name = "Mono-No-Aware Luxury Sake"
desc = "Dry alcohol made from rice, a favorite of businessmen."
icon_state = "sakebottle"
center_of_mass = list("x"=16, "y"=3)
/obj/item/weapon/reagent_containers/food/drinks/bottle/sake/Initialize()
. = ..()
reagents.add_reagent("sake", 100)
/obj/item/weapon/reagent_containers/food/drinks/bottle/champagne
name = "Gilthari Luxury Champagne"
desc = "For those special occassions."
icon_state = "champagne"
center_of_mass = list("x"=16, "y"=3)
/obj/item/weapon/reagent_containers/food/drinks/bottle/champagne/Initialize()
. = ..()
reagents.add_reagent("champagne", 100)
/obj/item/weapon/reagent_containers/food/drinks/bottle/peppermintschnapps
name = "Dr. Bone's Peppermint Schnapps"
desc = "A flavoured grain liqueur with a fresh, minty taste."
icon_state = "schnapps_pep"
center_of_mass = list("x"=16, "y"=3)
/obj/item/weapon/reagent_containers/food/drinks/bottle/peppermintschnapps/Initialize()
. = ..()
reagents.add_reagent("schnapps_pep", 100)
/obj/item/weapon/reagent_containers/food/drinks/bottle/peachschnapps
name = "Dr. Bone's Peach Schnapps"
desc = "A flavoured grain liqueur with a fruity peach taste."
icon_state = "schnapps_pea"
center_of_mass = list("x"=16, "y"=3)
/obj/item/weapon/reagent_containers/food/drinks/bottle/peachschnapps/Initialize()
. = ..()
reagents.add_reagent("schnapps_pea", 100)
/obj/item/weapon/reagent_containers/food/drinks/bottle/lemonadeschnapps
name = "Dr. Bone's Lemonade Schnapps"
desc = "A flavoured grain liqueur with a sweetish, lemon taste."
icon_state = "schnapps_lem"
center_of_mass = list("x"=16, "y"=3)
/obj/item/weapon/reagent_containers/food/drinks/bottle/lemonadeschnapps/Initialize()
. = ..()
reagents.add_reagent("schnapps_lem", 100)
/obj/item/weapon/reagent_containers/food/drinks/bottle/jager
name = "Schusskonig"
desc = "A complex tasting digestif. Thank god the original's trademark lapsed."
icon_state = "jager_bottle"
center_of_mass = list("x"=16, "y"=3)
/obj/item/weapon/reagent_containers/food/drinks/bottle/jager/Initialize()
. = ..()
reagents.add_reagent("jager", 100)

7
code/modules/mob/living/bot/cleanbot.dm
View File

@@ -11,6 +11,7 @@
wait_if_pulled = 1
min_target_dist = 0
var/vocal = 1
var/cleaning = 0
var/wet_floors = 0
var/spray_blood = 0
@@ -27,7 +28,7 @@
return ..()
/mob/living/bot/cleanbot/handleIdle()
if(!wet_floors && !spray_blood && prob(2))
if(!wet_floors && !spray_blood && vocal && prob(2))
custom_emote(2, "makes an excited booping sound!")
playsound(src, 'sound/machines/synth_yes.ogg', 50, 0)
@@ -167,6 +168,7 @@
data["blood"] = blood
data["patrol"] = will_patrol
data["vocal"] = vocal
data["wet_floors"] = wet_floors
data["spray_blood"] = spray_blood
@@ -193,6 +195,9 @@
will_patrol = !will_patrol
patrol_path = null
. = TRUE
if("vocal")
vocal = !vocal
. = TRUE
if("wet_floors")
wet_floors = !wet_floors
to_chat(usr, "<span class='notice'>You twiddle the screw.</span>")

3
code/modules/mob/living/bot/edCLNbot.dm
View File

@@ -12,6 +12,7 @@
patrol_speed = 3
target_speed = 6
vocal = 1
cleaning = 0
blood = 0
var/red_switch = 0
@@ -25,7 +26,7 @@
icon_state = "edCLN[on]"
/mob/living/bot/cleanbot/edCLN/handleIdle()
if(prob(10))
if(vocal && prob(10))
custom_emote(2, "makes a less than thrilled beeping sound.")
playsound(src, 'sound/machines/synth_yes.ogg', 50, 0)

11
code/modules/mob/living/bot/farmbot.dm
View File

@@ -96,9 +96,18 @@
turn_on()
. = TRUE
switch(action)
if("power")
if(!access_scanner.allowed(src))
return FALSE
if(on)
turn_off()
else
turn_on()
. = TRUE
if(locked)
return TRUE
switch(action)
if("water")
waters_trays = !waters_trays

10
code/modules/mob/living/bot/floorbot.dm
View File

@@ -12,6 +12,7 @@
wait_if_pulled = 1
min_target_dist = 0
var/vocal = 1
var/amount = 10 // 1 for tile, 2 for lattice
var/maxAmount = 60
var/tilemake = 0 // When it reaches 100, bot makes a tile
@@ -42,6 +43,7 @@
data["open"] = open
data["locked"] = locked
data["vocal"] = vocal
data["amount"] = amount
data["possible_bmode"] = list("NORTH", "EAST", "SOUTH", "WEST")
@@ -56,7 +58,6 @@
data["eattiles"] = eattiles
data["maketiles"] = maketiles
data["bmode"] = dir2text(targetdirection)
return data
/mob/living/bot/floorbot/attack_hand(var/mob/user)
@@ -75,7 +76,7 @@
if(..())
return TRUE
add_fingerprint(usr)
add_fingerprint(src)
switch(action)
if("start")
@@ -89,6 +90,9 @@
return
switch(action)
if("vocal")
vocal = !vocal
. = TRUE
if("improve")
improvefloors = !improvefloors
. = TRUE
@@ -108,7 +112,7 @@
tilemake = 0
addTiles(1)
if(prob(1))
if(vocal && prob(1))
custom_emote(2, "makes an excited beeping sound!")
playsound(src, 'sound/machines/twobeep.ogg', 50, 0)

1
code/modules/mob/living/bot/medbot.dm
View File

@@ -313,7 +313,6 @@
declare_treatment = !declare_treatment
. = TRUE
/mob/living/bot/medbot/emag_act(var/remaining_uses, var/mob/user)
. = ..()
if(!emagged)

21
code/modules/mob/living/bot/mulebot.dm
View File

@@ -70,17 +70,16 @@
ui.open()
/mob/living/bot/mulebot/tgui_data(mob/user)
var/list/data = list(
"suffix" = suffix,
"power" = on,
"issilicon" = issilicon(user),
"load" = load,
"locked" = locked,
"auto_return" = auto_return,
"crates_only" = crates_only,
"hatch" = open,
"safety" = safety,
)
var/list/data = ..()
data["suffix"] = suffix
data["power"] = on
data["issillicon"] = issilicon(user)
data["load"] = load
data["locked"] = locked
data["auto_return"] = auto_return
data["crates_only"] = crates_only
data["hatch"] = open
data["safety"] = safety
return data
/mob/living/bot/mulebot/tgui_act(action, params)

5
code/modules/mob/living/bot/secbot.dm
View File

@@ -109,6 +109,7 @@
data["check_arrest"] = null
data["arrest_type"] = null
data["declare_arrests"] = null
data["bot_patrolling"] = null
data["will_patrol"] = null
if(!locked || issilicon(user))
@@ -117,8 +118,8 @@
data["check_arrest"] = check_arrest
data["arrest_type"] = arrest_type
data["declare_arrests"] = declare_arrests
if(using_map.bot_patrolling)
data["will_patrol"] = will_patrol
data["bot_patrolling"] = using_map.bot_patrolling
data["patrol"] = will_patrol
return data

2
code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm
View File

@@ -165,12 +165,14 @@
return ..()
/mob/living/simple_mob/protean_blob/adjustBruteLoss(var/amount)
amount *= 1.5
if(humanform)
return humanform.adjustBruteLoss(amount)
else
return ..()
/mob/living/simple_mob/protean_blob/adjustFireLoss(var/amount)
amount *= 1.5
if(humanform)
return humanform.adjustFireLoss(amount)
else

4
code/modules/mob/living/carbon/human/species/station/protean_vr/protean_species.dm
View File

@@ -328,8 +328,8 @@ CHOMP Removal end*/
material_name = MAT_STEEL
/datum/modifier/protean/steel/tick()
holder.adjustBruteLoss(-2,include_robo = TRUE) //Looks high, but these ARE modified by species resistances, so this is really 20% of this
holder.adjustFireLoss(-1,include_robo = TRUE) //And this is really double this
holder.adjustBruteLoss(-1,include_robo = TRUE) //Modified by species resistances
holder.adjustFireLoss(-0.5,include_robo = TRUE) //Modified by species resistances
var/mob/living/carbon/human/H = holder
for(var/organ in H.internal_organs)
var/obj/item/organ/O = organ

1
code/modules/mob/living/simple_mob/simple_mob_vr.dm
View File

@@ -86,6 +86,7 @@
icon_state = "[icon_dead]-[vore_fullness]"
else if(((stat == UNCONSCIOUS) || resting || incapacitated(INCAPACITATION_DISABLED) ) && icon_rest && (vore_icons & SA_ICON_REST))
icon_state = "[icon_rest]-[vore_fullness]"
update_transform()
/mob/living/simple_mob/proc/will_eat(var/mob/living/M)
if(client) //You do this yourself, dick!

BIN
icons/_nanomaps/southern_cross_nanomap_z8.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.2 MiB

After

Width:  |  Height:  |  Size: 2.2 MiB

BIN
icons/mob/species/teshari/head.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 94 KiB

After

Width:  |  Height:  |  Size: 96 KiB

BIN
icons/mob/species/teshari/head_ch.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
icons/mob/species/teshari/suit.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 124 KiB

After

Width:  |  Height:  |  Size: 124 KiB

BIN
icons/mob/species/teshari/suit_ch.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 868 B

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
icons/mob/species/teshari/ties.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

BIN
icons/obj/clothing/species/teshari/hats.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.4 KiB

After

Width:  |  Height:  |  Size: 8.6 KiB

BIN
icons/obj/clothing/species/teshari/suits.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 4.4 KiB

BIN
icons/obj/drinks.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 89 KiB

After

Width:  |  Height:  |  Size: 96 KiB

25
maps/southern_cross/southern_cross-8.dmm
View File

@@ -7,13 +7,13 @@
"aag" = (/obj/machinery/light{dir = 4},/obj/machinery/computer/security{dir = 8},/turf/simulated/shuttle/floor/voidcraft/light,/area/shuttle/ninja)
"aah" = (/obj/machinery/vending/cola{dir = 4; name = "hacked Robust Softdrinks"; prices = list()},/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station)
"aai" = (/obj/machinery/vending/cigarette{dir = 4; name = "hacked cigarette machine"; prices = list(); products = list(/obj/item/weapon/storage/fancy/cigarettes = 10, /obj/item/weapon/storage/box/matches = 10, /obj/item/weapon/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2)},/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station)
"aaj" = (/turf/space,/obj/machinery/portable_atmospherics/canister/phoron,/obj/item/weapon/tank/vox,/turf/unsimulated/floor{icon_state = "asteroid"},/area/skipjack_station)
"aak" = (/turf/space,/obj/item/clothing/head/philosopher_wig,/turf/unsimulated/floor{icon_state = "asteroid"},/area/skipjack_station)
"aaj" = (/obj/machinery/portable_atmospherics/canister/phoron,/obj/item/weapon/tank/vox,/turf/space,/turf/unsimulated/floor{icon_state = "asteroid"},/area/skipjack_station)
"aak" = (/obj/item/clothing/head/philosopher_wig,/turf/space,/turf/unsimulated/floor{icon_state = "asteroid"},/area/skipjack_station)
"aal" = (/obj/machinery/vending/cigarette{dir = 4},/turf/unsimulated/floor{icon_state = "wood"},/area/centcom/bar)
"aam" = (/obj/machinery/vending/cigarette{dir = 8},/turf/unsimulated/floor{icon_state = "lino"},/area/tdome/tdomeobserve)
"aan" = (/turf/space,/obj/machinery/portable_atmospherics/canister/oxygen,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station)
"aan" = (/obj/machinery/portable_atmospherics/canister/oxygen,/turf/space,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station)
"aao" = (/obj/machinery/vending/coffee{dir = 8},/turf/unsimulated/floor{icon_state = "lino"},/area/tdome/tdomeobserve)
"aap" = (/turf/space,/obj/structure/table/rack,/obj/item/clothing/shoes/magboots,/obj/item/clothing/suit/space/syndicate/black/red,/obj/item/clothing/mask/breath,/obj/item/clothing/head/helmet/space/syndicate/black/red,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station)
"aap" = (/obj/structure/table/rack,/obj/item/clothing/shoes/magboots,/obj/item/clothing/suit/space/syndicate/black/red,/obj/item/clothing/mask/breath,/obj/item/clothing/head/helmet/space/syndicate/black/red,/turf/space,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station)
"aaq" = (/obj/machinery/vending/snack{dir = 8},/turf/unsimulated/floor{icon_state = "lino"},/area/tdome/tdomeobserve)
"aar" = (/obj/machinery/vending/cola{dir = 1},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar)
"aas" = (/obj/machinery/vending/coffee{dir = 1},/turf/unsimulated/floor{dir = 5; icon_state = "vault"},/area/centcom/bar)
@@ -40,13 +40,13 @@
"aaN" = (/obj/machinery/vending/boozeomat{dir = 1; req_access = null},/turf/simulated/shuttle/floor/black,/area/shuttle/merchant)
"aaO" = (/obj/machinery/vending/engivend{dir = 1},/turf/simulated/shuttle/floor/black,/area/shuttle/merchant)
"aaP" = (/obj/machinery/vending/tool{dir = 1},/turf/simulated/shuttle/floor/black,/area/shuttle/merchant)
"aaQ" = (/turf/space,/obj/machinery/atmospherics/pipe/manifold/visible{dir = 8},/obj/machinery/meter,/turf/simulated/shuttle/plating,/area/shuttle/skipjack)
"aaR" = (/turf/space,/obj/machinery/embedded_controller/radio/airlock/airlock_controller{dir = 8; frequency = 1331; id_tag = "vox_west_control"; pixel_x = 27; req_access = list(150); tag_airpump = null; tag_chamber_sensor = null; tag_exterior_door = null; tag_interior_door = null},/obj/machinery/atmospherics/unary/vent_pump/high_volume{dir = 8; id_tag = null},/obj/machinery/light/small,/obj/effect/map_helper/airlock/atmos/chamber_pump,/turf/simulated/shuttle/plating,/area/shuttle/skipjack)
"aaS" = (/turf/space,/obj/item/weapon/stool/padded,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar)
"aaT" = (/turf/space,/obj/machinery/biogenerator,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar)
"aaU" = (/turf/space,/obj/machinery/honey_extractor,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar)
"aaV" = (/turf/space,/obj/machinery/seed_storage/garden{dir = 1},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar)
"aaW" = (/turf/space,/obj/machinery/vending/hydronutrients{dir = 1},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar)
"aaQ" = (/obj/machinery/atmospherics/pipe/manifold/visible{dir = 8},/obj/machinery/meter,/turf/space,/turf/simulated/shuttle/plating,/area/shuttle/skipjack)
"aaR" = (/obj/machinery/embedded_controller/radio/airlock/airlock_controller{dir = 8; frequency = 1331; id_tag = "vox_west_control"; pixel_x = 27; req_access = list(150); tag_airpump = null; tag_chamber_sensor = null; tag_exterior_door = null; tag_interior_door = null},/obj/machinery/atmospherics/unary/vent_pump/high_volume{dir = 8; id_tag = null},/obj/machinery/light/small,/obj/effect/map_helper/airlock/atmos/chamber_pump,/turf/space,/turf/simulated/shuttle/plating,/area/shuttle/skipjack)
"aaS" = (/obj/item/weapon/stool/padded,/turf/space,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar)
"aaT" = (/obj/machinery/biogenerator,/turf/space,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar)
"aaU" = (/obj/machinery/honey_extractor,/turf/space,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar)
"aaV" = (/obj/machinery/seed_storage/garden{dir = 1},/turf/space,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar)
"aaW" = (/obj/machinery/vending/hydronutrients{dir = 1},/turf/space,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar)
"aaX" = (/obj/machinery/smartfridge{dir = 2},/turf/unsimulated/floor{icon_state = "lino"},/area/centcom/bar)
"aaY" = (/obj/machinery/vending/boozeomat{dir = 2},/turf/unsimulated/floor{icon_state = "lino"},/area/centcom/bar)
"aaZ" = (/obj/machinery/computer/pod{dir = 4; id = "thunderdomeaxe"; name = "Thunderdome Axe Supply"},/turf/unsimulated/floor{icon_state = "lino"},/area/tdome/tdomeadmin)
@@ -841,6 +841,7 @@
"hYS" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/box/syringes{pixel_x = 2; pixel_y = 2},/obj/item/weapon/storage/box/syringes,/turf/unsimulated/floor{dir = 5; icon_state = "vault"},/area/centcom/specops)
"hZH" = (/obj/effect/floor_decal/corner/white/diagonal,/obj/structure/table/marble,/obj/item/weapon/reagent_containers/food/condiment/small/peppermill,/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{pixel_x = 4; pixel_y = -2},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar)
"hZO" = (/obj/effect/floor_decal/industrial/warning{dir = 5},/obj/mecha/working/ripley/mining,/turf/simulated/shuttle/floor/black,/area/shuttle/merchant)
"iaB" = (/obj/machinery/access_button{dir = 8; name = "exterior access button"; pixel_x = 25; pixel_y = 6},/obj/machinery/door/airlock{icon = 'icons/obj/doors/Dooruranium.dmi'},/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/ninja_dojo/dojo)
"iaK" = (/obj/structure/table/rack,/obj/item/weapon/storage/belt/security/tactical/bandolier,/turf/simulated/shuttle/floor/voidcraft,/area/shuttle/syndicate)
"iaT" = (/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/terminal)
"iaZ" = (/obj/machinery/door/airlock/voidcraft/vertical{req_access = list(150)},/turf/simulated/shuttle/floor/voidcraft/dark,/area/shuttle/syndicate)
@@ -2338,7 +2339,7 @@ vFivFivFivFivFivFivFivFinXcsrgtgQtgQtgQtgQtgQtgQtgQtgQnXcjUWjUWjUWjUWjUWjUWjUWes
vFivFivFinXcnXcnXcnXcnXcnXcoJGtgQkwPawzawzawzpKRtgQtgQnXcnXcaibaibnXcjUWesrrolesresresresresrrolesrjUWnsfjUWjUWgjrmDpnyqnyqnyqnyqnyqjXSjXSnyqnyqnyqnyqnyqnyqnyqnyqnyqnyqnyqnyqmDpgjrvFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFidtVmcsmcsmcsmcsmcsmcsmcsmcsmcsxMOdNQbzTdNQdNQdNQlywomUlMYlMYlMYxMOxMOxMOxMOxMOlMYlMYlMYlMYaBzomUdAbhSzwdawdatpmwdalHIdtVmcsmcsmcsmcsmcstOXiVutOXppEppEppEppEppEppEppEppEppEuMqppEppEppEtOXcxZaFzaFzaFzacPtOXweCfWifWitOXtOXtOXmcsvFicFQgQFfxLgQFcFQvFimcsmcsmcsmcsmcsmcsmcsmcsmcsmcsdtVvFi
vFivFivFinXcwwzaxPaacnXctgQtgQtgQpFyhgahgahgajevtgQtgQtgQnXcgoEgoEnXcesresrununcEaadgxTtpxnvBunuesresrjUWjUWjUWgjrmDpnyqnyqnyqnyqjXSdLGsXZjXSnyqnyqnyqnyqnyqnyqnyqnyqnyqnyqnyqmDpgjrvFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFidtVmcsmcsmcsmcsmcsmcsmcsmcsmcsxMObeVdNQbeVdNQmoyvpVxMOlMYlMYlMYlMYlMYlMYlMYlMYlMYlMYlMYlMYlMYfSpdAbwdaptDjFbkSiwdalHIdtVmcsmcsmcsmcsmcstOXtOXtOXppEnvFvywppEppEppEppEsgnxIQtOXppEppEppEtOXiYSaFzaFzaFzmhKtOXbKgfWifWiqJExsZtOXmcsvFivFicFQfIscFQvFivFimcsmcsmcsmcsmcsmcsmcsmcsmcsmcsdtVvFi
vFivFivFinXclOilOilOiaFitgQtgQtgQpFyhgahgahgajevtgQtgQtgQlxXgoEgoElxXaZjaUiesrpxLxVZxVZxVZqyqrhtoLsesrjUWjUWjUWgjrmDpnyqnyqnyqnyqjXSjKFvsIjXSnyqnyqoDZnyqkwCnyqnyqnyqnyqnyqnyqmDpgjrvFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFidtVmcsmcsmcsmcsmcsmcsmcsmcsmcsxMOiGPkJdweGkJdbftkJdxMOdAblMYlMYlMYlMYlMYlMYlMYlMYlMYxMOxMOxMOlHIpmEdAbwdawdawdafjXlHIdtVmcsmcsmcsmcsmcsmcsmcstOXtOXjhjjhjtOXwGtwGttOXjhjjhjtOXtOXppEppEtOXtOXtOXduUtOXtOXtOXtOXdVctOXtOXtOXtOXmcsvFivFivFivFivFivFivFimcsmcsmcsmcsmcsmcsmcsmcsmcsmcsdtVvFi
vFivFivFinXcjCcjCcjCcnXctgQtgQtgQpFyhgahgahgajevtgQtgQtgQnXcgoEgoEnXcesruQSqkfjZRrhtrhtrhtrhtrhtbgeesrjUWjUWjUWgjrmDpnyqnyqnyqnyqnyqjXSjXSnyqnyqnyqnyqnyqnyqnyqnyqnyqnyqnyqnyqmDpgjrvFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFidtVmcsmcsmcsmcsmcsmcsmcsmcsmcsxMOxMOxMOxMOxMOxMOxMOxMOmrRmLCmrRxMOxMOxMOxMOxMOxMOxMOxMOlHIlHIlHIlHIankwdawdawdanTtlHIdtVmcsmcsmcsmcsmcsmcsmcsmcstOXuUPppEppEppEppEppEppEiHWtOXaaeppEppEjhjdZwdJxxDRxDRuRstOXtautausarsarsartOXtOXmcsmcsmcsmcsmcsmcsmcsmcsmcsmcsmcsmcsmcsmcsmcsmcsmcsdtVvFi
vFivFivFinXcjCcjCcjCcnXctgQtgQtgQpFyhgahgahgajevtgQtgQtgQnXcgoEgoEiaBesruQSqkfjZRrhtrhtrhtrhtrhtbgeesrjUWjUWjUWgjrmDpnyqnyqnyqnyqnyqjXSjXSnyqnyqnyqnyqnyqnyqnyqnyqnyqnyqnyqnyqmDpgjrvFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFidtVmcsmcsmcsmcsmcsmcsmcsmcsmcsxMOxMOxMOxMOxMOxMOxMOxMOmrRmLCmrRxMOxMOxMOxMOxMOxMOxMOxMOlHIlHIlHIlHIankwdawdawdanTtlHIdtVmcsmcsmcsmcsmcsmcsmcsmcstOXuUPppEppEppEppEppEppEiHWtOXaaeppEppEjhjdZwdJxxDRxDRuRstOXtautausarsarsartOXtOXmcsmcsmcsmcsmcsmcsmcsmcsmcsmcsmcsmcsmcsmcsmcsmcsmcsdtVvFi
vFivFivFinXcnXcnXcnXcnXcnXctgQtgQjoYmyKmyKmyKoTltgQtgQnXcnXcaibaibnXcesrunuunuaafrhtrhtrhtaagunuunuesrjUWjUWnsfgjrmDpnyqnyqbnonyqnyqnyqnyqnyqnyqnyqnyqnyqnyqnyqnyqnyqtrYnyqnyqmDpgjrvFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFidtVmcsmcsmcsmcsmcsmcsmcsmcsxMOxMOulblMYlMYdAbdAbxMOpqUpqUpqUpqUgVOxMOoLAlMYlMYlMYkbrxMOxMOlHIlHIlHIwdagwFjFbjFbbJblHIdtVmcsmcsmcsmcsmcsmcsmcsmcstOXuUPppEppEakjgjZppEppEqAVtOXaahppEppEtOXxDRxDRpHAxDRxDRtOXtautauksbksbksbiuttOXmcsmcsmcsmcsmcsmcsmcsmcsmcsmcsmcsmcsmcsmcsmcsmcsmcsdtVvFi
vFivFivFinXcjUWjUWjUWjUWnXctgQtgQtgQtgQtgQtgQtgQvcotgQnXcjUWjUWjUWjUWjUWesrunuoEQrhtlcFrhtdebunuesrjUWjUWjUWjUWgjrmDpnyqnyqoDZbnonyqnyqnyqnyqnyqnyqnyqnyqnyqnyqnyqnyqbnonyqnyqmDpgjrvFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFidtVmcsmcsmcsmcsmcsmcsmcsmcsxMOlMYlMYlMYlMYlMYdAbxMOpqUpqUprSpqUpqUxMOlMYlMYlMYlMYdAbdAbxMOlHIlHIlHIdrYwdawdawdawdalHIdtVmcsmcsmcsmcsmcsmcsmcsmcstOXuUPppEppEuUPcTyppEppEbVjtOXaaippEppEaygxDRxkMgyKhsKxDRhprtautautautautaumuGtOXmcsmcsmcsmcsmcsmcsmcsmcsmcsmcsmcsmcsmcsmcsmcsmcsmcsdtVvFi
vFivFivFinXcjUWjUWjUWjUWnXcunYunYunYtgQtgQtgQunYunYunYnXcjUWjUWnsfjUWjUWjUWesresraMCnzucOLesresrjUWjUWjUWjUWjUWgjrmDpnyqnyqnyqnyqnyqnyqnyqeIqnyqjvLnyqjvLnyqjxJnyqnyqnyqnyqnyqmDpgjrvFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFidtVmcsmcsmcsmcsmcsmcsmcsmcsxMOlMYlMYlMYlMYlMYlMYmLCpqUkuCfaNtpIpqUmLClMYlMYlMYlMYlMYdAbxMOlHImcslHIlHIaajaakcoRjfCjfCdtVmcsmcsmcsmcsmcsmcsmcsmcstOXuUPuyiuyiaanaapuyippElWztOXtprppEppEtOXxDRxkMgyKhsKxDRtOXtautauksbksbksbiUitOXmcsmcsmcsmcsmcsmcsmcsmcsmcsmcsmcsmcsmcsmcsmcsmcsmcsdtVvFi

31
maps/southern_cross/southern_cross-casino.dmm
View File

@@ -19,8 +19,8 @@
"aS" = (/obj/effect/blocker,/turf/simulated/mineral/ignore_mapgen/cave,/area/surface/outside/plains/mountains)
"aT" = (/obj/effect/floor_decal/techfloor/orange{dir = 1},/turf/simulated/floor/tiled/techfloor,/area/casino/casino_ship)
"aV" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/flora/ausbushes/brflowers,/turf/simulated/floor/outdoors/grass/heavy{outdoors = 0},/area/casino/casino_ship)
"aW" = (/obj/structure/table/glass,/obj/random/plushie,/turf/simulated/floor/carpet/bcarpet,/area/casino/casino_ship)
"aY" = (/obj/machinery/button/remote/blast_door{id = "Casinoboth 1"; name = "Casino Shutter"; pixel_x = -5; pixel_y = 29; req_one_access = list(200)},/obj/machinery/button/remote/blast_door{dir = 8; id = "CasinoEmergency2"; name = "Middle emergency shutters"; pixel_x = 28; pixel_y = -3; req_access = list(160)},/turf/simulated/floor/carpet/blucarpet,/area/casino/casino_ship)
"aW" = (/obj/structure/noticeboard{name = "Sentient prize board"},/turf/simulated/wall/golddiamond,/area/casino/casino_ship)
"aY" = (/obj/machinery/button/remote/blast_door{id = "Casinoboth 1"; name = "Casino Shutter"; pixel_x = -5; pixel_y = 29; req_one_access = list(200)},/obj/machinery/button/remote/blast_door{dir = 8; id = "CasinoEmergency2"; name = "Middle emergency shutters"; pixel_x = 28; pixel_y = -3; req_access = list(160)},/obj/structure/closet/crate/bin,/turf/simulated/floor/carpet/blucarpet,/area/casino/casino_ship)
"bb" = (/mob/living/simple_mob/animal/sif/glitterfly,/turf/simulated/floor/water,/area/surface/outside/plains/outpost)
"bd" = (/mob/living/simple_mob/animal/sif/tymisian,/turf/simulated/floor/outdoors/dirt{can_atmos_pass = 0; outdoors = 0; temperature = 300},/area/surface/outside/plains/mountains)
"bg" = (/obj/structure/flora/tree/winter1,/mob/living/simple_mob/animal/sif/glitterfly,/turf/simulated/floor/outdoors/snow/sif/planetuse{temperature = 293.15},/area/surface/outside/plains/outpost)
@@ -165,7 +165,7 @@
"fl" = (/obj/structure/table/fancyblack,/turf/simulated/floor/carpet/oracarpet,/area/casino/casino_ship)
"fo" = (/obj/structure/table/glass,/obj/item/weapon/paper_bin,/obj/item/device/tape,/obj/item/weapon/pen,/obj/item/weapon/pen{pixel_x = 4; pixel_y = 4},/turf/simulated/floor/wood,/area/casino/casino_ship/dorms)
"fp" = (/obj/structure/table/fancyblack,/turf/simulated/floor/carpet/turcarpet,/area/casino/casino_ship)
"fq" = (/obj/structure/table/marble,/obj/machinery/door/window/westright{dir = 1; layer = 3.1; name = "Both access"; req_access = list(200)},/obj/machinery/door/blast/shutters{id = "Casinoboth 1"; layer = 3.2; name = "Exchange booth shutters 1"},/turf/simulated/floor/carpet/blucarpet,/area/casino/casino_ship)
"fq" = (/obj/machinery/door/window/westright{dir = 1; layer = 3.1; name = "Both access"; req_access = list(200)},/obj/machinery/door/blast/shutters{id = "Casinoboth 1"; layer = 3.2; name = "Exchange booth shutters 1"},/turf/simulated/floor/carpet/blucarpet,/area/casino/casino_ship)
"fs" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/flora/lily2,/turf/simulated/floor/water{outdoors = 0},/area/casino/casino_ship)
"ft" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/flora/lily3,/turf/simulated/floor/water{outdoors = 0},/area/casino/casino_ship)
"fv" = (/turf/simulated/floor/carpet/turcarpet,/area/casino/casino_ship)
@@ -463,7 +463,6 @@
"sc" = (/mob/living/simple_mob/animal/passive/penguin/tux{hovering = 1},/turf/simulated/floor/wood/sif/broken,/area/surface/outside/plains/outpost)
"sd" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/structure/flora/ausbushes/ppflowers,/turf/simulated/floor/outdoors/grass/heavy{outdoors = 0},/area/casino/casino_ship)
"sm" = (/obj/random/trash,/turf/simulated/floor/tiled/freezer,/area/submap/lonehome)
"sq" = (/obj/structure/noticeboard{name = "Sentient prize board"},/turf/simulated/wall/golddiamond,/area/casino/casino_ship)
"su" = (/obj/structure/table/glass,/obj/item/weapon/reagent_containers/food/drinks/cup{pixel_x = 8; pixel_y = -3},/obj/item/weapon/reagent_containers/food/drinks/cup{pixel_x = -4; pixel_y = -3},/obj/item/weapon/storage/box/donut{pixel_y = 11},/obj/machinery/light{dir = 1},/turf/simulated/floor/wood,/area/casino/casino_ship/dorms)
"sy" = (/obj/structure/girder/displaced,/turf/simulated/floor/outdoors/snow/sif/planetuse{temperature = 293.15},/area/surface/outside/plains/outpost)
"sA" = (/obj/structure/table/bench/sifwooden,/turf/simulated/floor/outdoors/dirt{can_atmos_pass = 0; outdoors = 0; temperature = 300},/area/surface/outside/plains/mountains)
@@ -519,7 +518,7 @@
"vv" = (/obj/structure/sink{pixel_x = -16; pixel_y = 24},/obj/structure/toilet{dir = 8},/turf/simulated/floor/tiled/dark,/area/casino/casino_ship/wing_right)
"vx" = (/obj/effect/mist,/obj/effect/floor_decal/spline/fancy/wood{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/black,/turf/simulated/floor/wood,/area/casino/casino_ship)
"vA" = (/obj/effect/decal/remains/deer,/turf/simulated/floor/outdoors/dirt{can_atmos_pass = 0; outdoors = 0; temperature = 300},/area/surface/outside/plains/mountains)
"vF" = (/obj/structure/table/glass,/obj/machinery/recharger,/turf/simulated/floor/carpet/bcarpet,/area/casino/casino_ship)
"vF" = (/obj/structure/table/glass,/obj/item/weapon/book/manual/casino,/obj/item/weapon/book/manual/casino,/obj/item/weapon/book/manual/casino,/obj/item/weapon/book/manual/casino,/turf/simulated/floor/carpet/bcarpet,/area/casino/casino_ship)
"vI" = (/obj/structure/window/reinforced{health = 1e+006},/obj/structure/flora/ausbushes/genericbush,/turf/simulated/floor/grass2,/area/casino/casino_ship)
"vL" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/machinery/door/blast/shutters{dir = 2; id = "Casinodormshutters5"; layer = 3.5; name = "Casino Privacy shutters"},/turf/simulated/floor,/area/casino/casino_ship/dorms)
"vN" = (/obj/structure/window/reinforced{health = 1e+006},/obj/structure/flora/ausbushes/pointybush,/turf/simulated/floor/outdoors/grass/heavy{outdoors = 0},/area/casino/casino_ship)
@@ -616,7 +615,6 @@
"Ah" = (/obj/structure/window/reinforced{dir = 8; health = 1e+006},/turf/simulated/floor/grass2,/area/casino/casino_ship)
"Ak" = (/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/structure/flora/ausbushes/sunnybush,/turf/simulated/floor/grass2,/area/casino/casino_ship)
"Ao" = (/obj/structure/window/reinforced{health = 1e+006},/obj/structure/flora/ausbushes/reedbush,/turf/simulated/floor/grass2,/area/casino/casino_ship)
"AA" = (/obj/structure/table/glass,/obj/item/weapon/book/manual/casino,/obj/item/weapon/book/manual/casino,/obj/item/weapon/book/manual/casino,/obj/item/weapon/book/manual/casino,/obj/item/weapon/book/manual/casino,/turf/simulated/floor/carpet/bcarpet,/area/casino/casino_ship)
"AB" = (/obj/structure/window/reinforced{dir = 4; health = 1e+006},/obj/structure/window/reinforced{dir = 8},/obj/structure/flora/ausbushes/ppflowers,/turf/simulated/floor/outdoors/grass/heavy{outdoors = 0},/area/casino/casino_ship)
"AF" = (/obj/effect/floor_decal/techfloor/orange{dir = 9},/turf/simulated/floor/tiled/techfloor,/area/casino/casino_ship)
"AK" = (/obj/effect/decal/cleanable/ash,/turf/simulated/floor/flock,/area/surface/outside/plains/mountains)
@@ -722,7 +720,6 @@
"Gs" = (/obj/machinery/vending/cola,/obj/machinery/light{dir = 8},/turf/simulated/floor/carpet/bcarpet,/area/casino/casino_ship)
"Gu" = (/obj/structure/table/marble,/obj/machinery/door/blast/shutters{dir = 4; id = "Casinobar"; layer = 3.1; name = "Casino bar shutter"},/turf/simulated/floor/carpet/oracarpet,/area/casino/casino_ship)
"Gz" = (/obj/structure/curtain/open/bed{name = "casino curtain"},/obj/machinery/light{dir = 1},/turf/simulated/floor/carpet/blucarpet,/area/casino/casino_ship)
"GD" = (/obj/structure/table/glass,/obj/item/weapon/book/manual/casino,/obj/item/weapon/book/manual/casino,/obj/item/weapon/book/manual/casino,/obj/item/weapon/book/manual/casino,/obj/item/weapon/book/manual/casino,/obj/item/weapon/book/manual/casino,/obj/machinery/light{dir = 8},/turf/simulated/floor/carpet/bcarpet,/area/casino/casino_ship)
"GG" = (/obj/machinery/crystal/ice,/turf/simulated/floor/outdoors/ice{outdoors = 0},/area/surface/outside/plains/mountains)
"GL" = (/obj/structure/table/wooden_reinforced,/obj/item/device/starcaster_news,/turf/simulated/floor/carpet/bcarpet,/area/casino/casino_ship)
"GP" = (/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/effect/decal/cleanable/dirt,/mob/living/simple_mob/animal/sif/glitterfly/rare{canmove = 0; glow_intensity = 0.5; glow_range = 7.5; glow_toggle = 1; move_speed = 10000; movement_cooldown = -10000},/turf/simulated/floor/tiled/white,/area/submap/lonehome)
@@ -912,7 +909,7 @@
"Sf" = (/obj/machinery/light{layer = 3},/turf/simulated/floor/water/deep/pool,/area/casino/casino_ship)
"Sh" = (/obj/structure/window/reinforced{health = 1e+006},/obj/structure/window/reinforced{dir = 4; health = 1e+006},/obj/structure/flora/ausbushes/reedbush,/turf/simulated/floor/outdoors/grass/heavy{outdoors = 0},/area/casino/casino_ship)
"Sn" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/structure/flora/ausbushes/ppflowers,/turf/simulated/floor/grass2,/area/casino/casino_ship)
"Sp" = (/obj/machinery/button/remote/blast_door{dir = 1; id = "Casinoboth 2"; name = "Casino Shutter"; pixel_x = -4; pixel_y = -29; req_one_access = list(200)},/obj/machinery/button/remote/blast_door{dir = 8; id = "Casinoprizes"; name = "Prize Shutters"; pixel_x = 28; pixel_y = 4; req_one_access = list(200)},/turf/simulated/floor/carpet/blucarpet,/area/casino/casino_ship)
"Sp" = (/obj/machinery/button/remote/blast_door{dir = 1; id = "Casinoboth 2"; name = "Casino Shutter"; pixel_x = -4; pixel_y = -29; req_one_access = list(200)},/obj/machinery/button/remote/blast_door{dir = 8; id = "Casinoprizes"; name = "Prize Shutters"; pixel_x = 28; pixel_y = 4; req_one_access = list(200)},/obj/structure/table/marble,/obj/item/modular_computer/laptop/preset/custom_loadout/hybrid,/turf/simulated/floor/carpet/blucarpet,/area/casino/casino_ship)
"Sq" = (/obj/machinery/button/remote/blast_door{id = "Casinodormshutters2"; name = "Casino Dorm Shutters"; pixel_x = 24; pixel_y = -6},/obj/structure/bed/double/padded,/obj/item/weapon/bedsheet/hosdouble,/turf/simulated/floor/wood,/area/casino/casino_ship/dorms)
"Sv" = (/obj/structure/window/reinforced{dir = 1; health = 1e+006; req_access = list(5)},/turf/simulated/floor/outdoors/grass/heavy{outdoors = 0},/area/casino/casino_ship)
"Sx" = (/obj/structure/table/rack/shelf/steel,/obj/item/weapon/storage/toolbox/electrical{pixel_y = 7},/obj/item/weapon/storage/toolbox/mechanical,/turf/simulated/floor/plating,/area/submap/lonehome)
@@ -987,7 +984,7 @@
"WJ" = (/obj/structure/bed/chair/comfy/purp{dir = 8},/turf/simulated/floor/wood,/area/casino/casino_ship)
"WL" = (/turf/simulated/floor/wood/sif/broken,/area/surface/outside/plains/outpost)
"WQ" = (/turf/simulated/floor/outdoors/dirt{can_atmos_pass = 0; outdoors = 0; temperature = 300},/area/submap/lonehome)
"WS" = (/obj/machinery/door/airlock/silver{name = "Lounge"},/turf/simulated/floor/carpet/bcarpet,/area/casino/casino_ship)
"WS" = (/obj/machinery/door/airlock/silver{name = "Lounge"; req_one_access = list(300)},/turf/simulated/floor/carpet/bcarpet,/area/casino/casino_ship)
"WT" = (/obj/structure/table/marble,/obj/machinery/chemical_dispenser/bar_alc/full,/turf/simulated/floor/wood/sif,/area/submap/lonehome)
"WV" = (/obj/structure/table/gamblingtable,/turf/simulated/floor/carpet/blucarpet,/area/casino/casino_ship)
"Xf" = (/obj/structure/flora/tree/winter,/obj/effect/zone_divider,/turf/simulated/floor/outdoors/snow/sif/planetuse{temperature = 293.15},/area/surface/outside/plains/outpost)
@@ -1029,7 +1026,7 @@
"Zj" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4; health = 1e+006},/obj/machinery/door/blast/shutters{dir = 2; id = "Casinodormshutters5"; layer = 3.5; name = "Casino Privacy shutters"},/turf/simulated/floor,/area/casino/casino_ship/dorms)
"Zl" = (/obj/structure/bed/chair/comfy/red{dir = 4},/turf/simulated/floor/carpet/oracarpet,/area/casino/casino_ship)
"Zn" = (/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/brown/border{dir = 8},/obj/machinery/light{dir = 8},/turf/simulated/floor/tiled,/area/casino/casino_ship/wing_left)
"Zq" = (/obj/structure/table/marble,/obj/machinery/door/window/westright{dir = 2; layer = 3.1; name = "Both access"; req_access = list(200)},/obj/machinery/door/blast/shutters{dir = 2; id = "Casinoboth 2"; layer = 3.2; name = "Exchange booth shutters 2"},/turf/simulated/floor/carpet/blucarpet,/area/casino/casino_ship)
"Zq" = (/obj/machinery/door/window/westright{dir = 2; layer = 3.1; name = "Both access"; req_access = list(200)},/obj/machinery/door/blast/shutters{dir = 2; id = "Casinoboth 2"; layer = 3.2; name = "Exchange booth shutters 2"},/turf/simulated/floor/carpet/blucarpet,/area/casino/casino_ship)
"Zs" = (/obj/structure/table/marble,/obj/machinery/door/blast/shutters{dir = 8; id = "Casinobar"; layer = 3.1; name = "Casino bar shutter"},/turf/simulated/floor/carpet/oracarpet,/area/casino/casino_ship)
"Zt" = (/obj/machinery/iv_drip,/obj/effect/floor_decal/borderfloorwhite,/obj/effect/floor_decal/corner/paleblue/border,/turf/simulated/floor/tiled/white,/area/casino/casino_ship/wing_left)
"Zw" = (/obj/structure/toilet{dir = 4},/turf/simulated/floor/tiled/freezer,/area/casino/casino_ship/dorms)
@@ -1044,7 +1041,7 @@
"ZP" = (/obj/structure/bed/chair{dir = 8},/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/red/border{dir = 4},/turf/simulated/floor/tiled,/area/casino/casino_ship/wing_right)
"ZR" = (/obj/effect/floor_decal/borderfloor/corner,/obj/effect/floor_decal/corner/red/bordercorner,/turf/simulated/floor/tiled,/area/casino/casino_ship/wing_right)
"ZW" = (/obj/structure/table/glass,/obj/item/toy/eight_ball/conch,/turf/simulated/floor/carpet/bcarpet,/area/casino/casino_ship)
"ZY" = (/obj/structure/table/glass,/obj/item/toy/eight_ball,/obj/machinery/light{dir = 8},/turf/simulated/floor/carpet/bcarpet,/area/casino/casino_ship)
"ZY" = (/obj/structure/table/glass,/obj/machinery/light{dir = 8},/turf/simulated/floor/carpet/bcarpet,/area/casino/casino_ship)
"ZZ" = (/obj/structure/table/bench/sifwooden,/obj/machinery/light,/obj/effect/floor_decal/spline/fancy/wood/corner{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/black{dir = 5},/obj/effect/mist,/turf/simulated/floor/wood,/area/casino/casino_ship)
(1,1,1) = {"
@@ -1185,19 +1182,19 @@ hPmcmcmcmcmcmcmcmcmcmcmcmcmcmcmNgNgNgNgNgNcqNsabYLxXxXxXTXabujdJdJdJdJdJpJabHhbN
hPmcmcmcmcmcmcmcmcmcmcmcmcmcmcmNgNgNgNAOgNcqNsabUbMuytUbZtabLlXZQOoDqYpPKbabXUbNgtbNRIbNacacacacBnAdAdNCeFeFeFdzdzAYdzevWobNbNbNbNbNbNbNbNbNbNbNbNbNbNbNbNbNkEbNbNbNbNbNbNbNBFbNbNbNbNbNBFbNbNbNbNbNBFbNbNbNeJacqWCbAfAfAfpdVdpdpdpdoZacqiqibDbDbDnBeEeEeEwaeEeEeEmUacacacmNmNmNmNlFmNmNmNmNmNmNmNmNfBmNmNmNmNmNmNmNaFmNmNmNaFmNmNmNmNmNmNmNmNmNmNmNfBmNwtmNmNmNblmNmNmNmNmNmNmNav
hPmcmcmcmcmcmcmcmcmcmcmcmcmcmcmcmNmNgNgNgNabNsabababababababababababababababZIbNgtqaykSvePfEfEczSveVEPHheFeFeFeFeFeFeFeXZFbNbNbNbNbNbNbNbNbNbNbNbNbNbNbNbNQokEbNbNbNbNbNbNbNbNbNbNbNbNbNbNbNbNQobNbNbNbNbNbNocacPttFAfoZoZZzoZoZDHoZmWacbDbDbDbDbDacWtpMtoacOHpMOHacacacacgNgNmNmNlFmNmNmNdqmNmNcCmNmNmNmNmNmNmNmNmNmNmNaFmNmNmNmNmNmNmNmNmNmNmNdqmNmNmNmNaFmNmNblmNmNmNmNwtmNmNav
hPmcmcmcmcmcmcmcmcmcmcmcmcmcmcmcmNgNgNgNgNdrcqacVdgzNHKpFnrdxHPJXvQqrdGLRAXveFbNgtkbzljrpdfEePpdDcNojkacbObNbNeFeFeFeFeoqFbNbNeFenhMhMhMhMhMeneFeFeFeFiefjcRacmzeFeFeFeFeFGSeFeFeFGSsdPifsftaVoEfFzntzKwbNbNXMacxzoZAfoZDHoZoZCvoZoZoZacacacwvacacacacacacacacacacacacacacacmNmNmNlFmNmNmNmNmNmNmNhXhXmNmNeGmNmNmNmNmNmNmNmNmNmNmNmNmNmNmNmNmNmNmNmNmNmNmNmNmNhXblmNdqmNmNmNmNmNav
hPmcmcmcmcmcmcmcmcmcmcmcmcmcmcmcgNgNgNgNgNdrcqacRqDcfLeFeFrdXWXiXveFrdXWKrXveFbNgtfPNGRqpdqGjgAfzlpdhZackybNbNeFeFeFieiEdzbNbNeFacjGjGjGjGjGaceFjQjQjQeFYXcZUTvFeFeFeFceacacaceFnGaczNpzpzpzDaacacacacacbNbNvUacrLqWAfSLoZxzTxJDtFRYCvacMMeFeFQqLXlBRXwULXXWRXXMaclOlOuOHiacgNmNmNlFmNmNmNmNmNmNmNmNmNmNmNmNmNmNmNmNmNmNmNmNhXmNmNmNmNmNmNmNmNmNmNmNmNmNmNmNmNmNblmNmNmNmNmNmNmNav
hPmcmcmcmcmcmcmcmcmcmcmcmcmcmcmcgNgNgNcpgNdrcqacTTiVjReFeFeFeFeFeFeFeFeFeFeFeFbNgtVtjVexjUkckfkMkSAoeyJceFbNbNeFeFeFlboMxdRBbNhMZsdzdzdzdzdzGueFjQPYjQeFdzwVacGDeFeFeFdztXfeacfqacacqwfyfOPEVmacyjaQaRacRBbNCRacacactUacacacacacacacacacIMeFeFeFTgXWYVEjTglBYVSnaclOdzdzHiBWgNmNmNlFmNeGmNmNmNmNmNmNhXmNmNmNmNmNhXmNmNmNmNmNmNmNmNmNmNmNmNmNmNmNmNmNmNaFmNmNmNmNblmNmNmNmNmNmNmNav
hPmcmcmcmcmcmcmcmcmcmcmcmcmcmcmcmNmNgNgNgNdrcqacAFaTQPbNbNbNbNbNbNbNbNbNbNbNbNbNgtbNBFbNbNbNbNbNbNBFbNbNbNbNbNbNbNbNbNbNbNbNbNhMZsdzulpknjdzGueFjQjQjQeFdzJMacaWeFeFeFdzMCqvGzbDaYacpTCDoJCDTZacydbDPHacbNbNdzdzlCdzdzdzdzdzdzlCdzdzdzacHheFeFeFeFeFeFQqeFeFeFQqaclOdzdzHiBtgNmNmNlFmNmNmNmNcCmNmNmNmNmNmNmNeGmNmNmNfBmNmNmNmNmNmNmNmNdqmNmNmNmNeGmNmNmNmNmNmNmNblmNhYmNeGmNmNmNav
hPmcmcmcmcmcmcmcmcmcmcmcmcmcmcmcgNgNgNgNgNdrcqacRqDcfLeFeFrdXWXiXveFrdXWKrXveFbNgtfPNGRqpdqGjgAfzlpdhZackybNbNeFeFeFieiESObNbNeFacjGjGjGjGjGaceFjQjQjQeFYXcZUTvFeFeFeFceacacaceFnGaczNpzpzpzDaacacacacacbNbNvUacrLqWAfSLoZxzTxJDtFRYCvacMMeFeFQqLXlBRXwULXXWRXXMaclOlOuOHiacgNmNmNlFmNmNmNmNmNmNmNmNmNmNmNmNmNmNmNmNmNmNmNmNhXmNmNmNmNmNmNmNmNmNmNmNmNmNmNmNmNmNblmNmNmNmNmNmNmNav
hPmcmcmcmcmcmcmcmcmcmcmcmcmcmcmcgNgNgNcpgNdrcqacTTiVjReFeFeFeFeFeFeFeFeFeFeFeFbNgtVtjVexjUkckfkMkSAoeyJceFbNbNeFeFeFlboMxdRBbNhMZsdzdzdzdzdzGueFjQPYjQeFdzwVacZYeFeFeFdztXfeacfqacacqwfyfOPEVmacyjaQaRacRBbNCRacacactUacacacacacacacacacIMeFeFeFTgXWYVEjTglBYVSnaclOdzdzHiBWgNmNmNlFmNeGmNmNmNmNmNmNhXmNmNmNmNmNhXmNmNmNmNmNmNmNmNmNmNmNmNmNmNmNmNmNmNaFmNmNmNmNblmNmNmNmNmNmNmNav
hPmcmcmcmcmcmcmcmcmcmcmcmcmcmcmcmNmNgNgNgNdrcqacAFaTQPbNbNbNbNbNbNbNbNbNbNbNbNbNgtbNBFbNbNbNbNbNbNBFbNbNbNbNbNbNbNbNbNbNbNbNbNhMZsdzulpknjdzGueFjQjQjQeFdzJMaWMzeFeFeFdzMCqvGzbDaYacpTCDoJCDTZacydbDPHacbNbNdzdzlCdzdzdzdzdzdzlCdzdzdzacHheFeFeFeFeFeFQqeFeFeFQqaclOdzdzHiBtgNmNmNlFmNmNmNmNcCmNmNmNmNmNmNmNeGmNmNmNfBmNmNmNmNmNmNmNmNdqmNmNmNmNeGmNmNmNmNmNmNmNblmNhYmNeGmNmNmNav
hPmcmcmcmcmcmcmcmcmcmcmcmcmcmcmNmNmNgNgNgNdrcqacBybwbxbNbNbNFPsQdclrdcmaRBbNbNbNgtbNbNbNbNbNbNbNbNbNbNbNbNbNbNbNbNbNbNbNbNbNbNhMZsdzZxzdImdzpeeFeFeFeFeFdzLvUTHheFeFeFdzoQbDkCbDbDHQbDbDbDbDbDHQbDbDbDbtbNbNdzdzdzdzdzdzdzdzdzdzdzdzdzWSeFeFeFeFeFeFeFeFeFeFeFeFPMlOdzZlYqBtgNmNmNlFmNmNmNhXmNmNmNmNmNmNmNmNmNmNmNmNeGmNmNmNmNmNhYmNmNmNmNmNmNmNmNmNmNmNmNmNmNmNblmNmNmNmNmNmNmNav
hPmcmcmcmcmcmcmcmcmcmcmcmcmcmcmNmNgNgNcpgNdrcqacIPzCNXbNbNbNbNbNbNbNbNbNbNbNbNbNgtbNQobNbNbNbNbNbNQobNbNbNbNbNbNbNbNbNbNbNbNbNhMZsdzKiobEVdzGueFjQjQjQeFdzRxacAAeFeFeFdzMCqvVnbDSpacRDWwPwWwxQacYEbDbEacbNbNdzdzlpdzdzdzdzdzdzlpdzdzdzaceFeFeFeFeFeFeFGSeFeFeFGSaclOdzdzHiBtmNmNmNlFmNmNmNmNmNmNmNmNmNmNmNmNmNmNmNhXmNfBmNmNmNmNfBmNfBmNmNmNmNmNmNmNmNmNmNmNmNmNblmNmNmNmNmNmNmNav
hPmcmcmcmcmcmcmcmcmcmcmcmcmcmcmNmNgNgNcpgNdrcqacIPzCNXbNbNbNbNbNbNbNbNbNbNbNbNbNgtbNQobNbNbNbNbNbNQobNbNbNbNbNbNbNbNbNbNbNbNbNhMZsdzKiobEVdzGueFjQjQjQeFdzRxaWMzeFeFeFdzMCqvVnbDSpacRDWwPwWwxQacYEbDbEacbNbNdzdzlpdzdzdzdzdzdzlpdzdzdzaceFeFeFeFeFeFeFGSeFeFeFGSaclOdzdzHiBtmNmNmNlFmNmNmNmNmNmNmNmNmNmNmNmNmNmNmNhXmNfBmNmNmNmNfBmNfBmNmNmNmNmNmNmNmNmNmNmNmNmNblmNmNmNmNmNmNmNav
hPmcmcmcmcmcmcmcmcmcmcmcmcmcmNmNmNmNgNgNgNdrcqacOPJplZeFeFeFeFeFeFeFeFeFeFeFeFbNgtmrSvmtSvQWSvmAmDmAnLJceFbNbNeFeFeFlbnTTARBbNhMZsdzdzdzdzdzGueFjQPYjQeFdzwVacZYeFeFeFdztXquacZqacaczWKhYMvQuoacINBqbRacRBbNEkacacacySacacacacacacacacacwWeFeFeFLXlBRXHPLXXWRXoyaclOdzdzHinZmNmNmNlFmNmNmNcCmNmNmNmNmNmNmNmNmNmNmNmNmNaimNmNmNfBmNmNmNmNmNmNmNmNhXmNmNmNmNmNmNmNblmNmNmNaFmNdqmNav
hPmcmcmcmcmcmcmcmcmcmcmcmcmcmNmNgNgNgNgNgNdrcqacVdozoPeFeFrdXWmQXveFrdmsXWXveFbNgtpgNGpdNopdDcpApQpApVackybNbNeFeFeFiepZdzbNbNeFackvkvkvkvkvaceFjQjQjQeFaLGeUTvFeFeFeFcesqsqsqeFnGaczNpzpzpzDaacacacacacbNbNXMaccilOlOlODyaccmbVKdqXYNacZIeFeFGSTgXWYVABTglBYVrsaclOlOEJHiacgNmNmNlFmNmNmNmNmNXPmNmNmNmNdqmNmNmNeGmNmNcCmNmNmNmNmNmNmNmNdqmNmNeGmNaFanmNmNwtmNmNblmNhXmNmNmNmNmNav
hPmcmcmcmcmcmcmcmcmcmcmcmcmcmNmNgNgNgNgNgNdrcqacVdozoPeFeFrdXWmQXveFrdmsXWXveFbNgtpgNGpdNopdDcpApQpApVackybNbNeFeFeFiepZSObNbNeFackvkvkvkvkvaceFjQjQjQeFaLGeUTvFeFeFeFceacacaceFnGaczNpzpzpzDaacacacacacbNbNXMaccilOlOlODyaccmbVKdqXYNacZIeFeFGSTgXWYVABTglBYVrsaclOlOEJHiacgNmNmNlFmNmNmNmNmNXPmNmNmNmNdqmNmNmNeGmNmNcCmNmNmNmNmNmNmNmNdqmNmNeGmNaFanmNmNwtmNmNblmNhXmNmNmNmNmNav
hPmcmcmcmcmcmcmcmcmcmcmcmcmNmNmNmNgNgNcpgNdrcqacRqzlrFKpFnrdGLyvXvGSrdXWwPXveFbNgtfPpdRqjgczfEgzAfpArzacbObNbNeFeFeFeFrWCSbNbNeFcHhMhMhMhMhMcHeFeFeFeFierYsFacmzeFeFeFeFeFQqeFeFeFQqtrcScSttudOAuGOAchKwbNbNocacUelOlOlOEoacmPmPvxVjVjacacacItacacacacacacacacacacacacacacacgNmNmNfXmNmNmNmNmNmNmNmNmNmNfBmNmNmNmNmNmNmNmNdqmNmNmNmNmNmNmNcCmNmNmNmNmNmNmNmNmNmNblmNmNmNmNmNmNmNav
hPmcmcmcmcmcmcmcmcmcmcmcmcmNmNgNgNmNgNgNgNhkTwhkhkhkhkhkhkhkhkhkhkhkhkhkhkhkMMbNgtiIvIkSfEfEePfEvNwbeyHheFeFeFeFeFeFeFeoQjbNbNbNbNbNbNbNbNbNbNbNbNbNbNbNbNBFkEbNbNbNbNbNbNbNbNbNbNbNbNbNbNbNbNBFbNbNbNbNbNbNeJacDElOlOlOlOcUdjdjvxVjVjacdklOlOlOdkacogsJIzlOdflODleEunVVacgNmNmNmNlFmNmNmNmNmNmNmNdqmNmNmNmNmNmNmNmNmNmNmNmNmNmNmNeGmNmNmNmNmNmNmNdqmNmNmNmNmNmNblmNmNmNmNmNmNmNav
hPmcmcmcmcmcmcmcmcmcmcmcmcmNmNgNgNgNgNgNgNeSTwhkbXdebAaqbndevvhkAUEbkdkdcohkGsbNgtbNBFbNacacacacSWekekkaeFeFeFdzdzAYdzwzWobNbNbNbNbNbNbNbNbNbNbNbNbNbNbNbNbNkEbNbNbNbNbNbNbNQobNbNbNbNbNQobNbNbNbNbNQobNbNbNLnacUelOlOlOlOacZMMFZZxhdBaclOdzdzdzlOqKlOlOlOlOlODyacWtrNacacmNmNmNmNlFmNmNmNmNmNmNhXmNmNhXmNmNmNmNmNmNeGhXmNmNmNmNmNmNmNmNeGmNfBmNmNmNmNmNmNmNmNmNblmNmNmNwtmNmNmNav
hPmcmcmcmcmcmcmcmcmcmcmcmcmNgNmNgNgNgNAOgNeSTwhkPNjyyblUybjyPNhkIKlUlUlUlUhkHhbNAZTOUKFPacnAlXacuZrKTfcMeFeFeFdzZcoCcexnzSOQCXuBdzdzdzdzdzqFaLOQCXCSdzdzSOHGackyeFeFeFGSeFaPaPaPaPyDaPaPaPaPaPbCaPaPaPaPaPOpaPaPBTlOlOlOqCacacacacacacactvdzdzdzJbaclOlOlOZBWJacacacacacgNmNmNeGmNlFhXmNmNmNmNmNmNmNmNmNmNmNdqmNmNmNfBmNmNeGmNmNmNmNmNmNmNmNmNmNcCaFmNmNmNmNmNmNblmNmNmNmNmNhYmNav
hPmcmcmcmcmcmcmcmcmcmcmcmcmNmNmNmNmNgNgNgNepeShkhkhkhkeRhkhkhkhkhkmehkhkhkhkhkVNfRhkfSGmacdyPUacuqmyFapDeFeFeFdzdzdzdzxuxAdwdLQhdwelzseFindhQhdSelxAdhdLQhShacbOeFeFknlLrxaPejcKlMbhlNaPejcKlMbhlNaPejcKlMbhlNaPlOlOlOlOlOMXihmCmCmCXMaclOdzdzdzlOacdydydyHslOacacacgNgNmNmNmNmNmNlFmNmNmNmNmNeGmNmNmNmNmNmNmNmNmNmNmNmNmNmNmNmNmNmNmNmNmNmNmNmNmNmNmNmNmNmNmNmNblwtmNmNmNmNmNmNav
hPmcmcmcmcmcmcmcmcmcmNmNmNmNmNgNgNgNgNgNgNepeShkeHeThklUSXVvybuixblUlUlUVFlUlUlUyFhkYnjOacdZacaceFeFeFeFeFeFeFeFeFeFeFeFIbeqZWdMeqIbeFeFeFIbeqeqcIeueqeqIbeFeFeFeFeFMzXMjraPZweYaPlPKVaPZweYaPlPSbaPZweYaPlPTKaPeEeEeEeEeEeEihmCmCSBgyaclOgJwDfJlOacdyeseLacacacmNmNmNmNmNmNmNmNmNlFmNmNfBmNmNmNmNmNmNmNmNmNmNmNmNeGmNmNmNmNmNmNmNmNmNfBmNmNmNmNmNmNmNmNmNmNmNhXblmNmNmNaFmNmNmNav
hPmcmcmcmcmcmcmcmcmcmNmNmNmNmNgNgNgNgNgNgNepeShkeHeThklUSXVvybuixblUlUlUVFlUlUlUyFhkYnjOacdZacaceFeFeFeFeFeFeFeFeFeFeFHhIbeqZWdMeqIbeFeFeFIbeqeqcIeueqeqIbHheFeFeFeFMzXMjraPZweYaPlPKVaPZweYaPlPSbaPZweYaPlPTKaPeEeEeEeEeEeEihmCmCSBgyaclOgJwDfJlOacdyeseLacacacmNmNmNmNmNmNmNmNmNlFmNmNfBmNmNmNmNmNmNmNmNmNmNmNmNeGmNmNmNmNmNmNmNmNmNfBmNmNmNmNmNmNmNmNmNmNmNhXblmNmNmNaFmNmNmNav
hPmcmcmcmcmcmcmcmcmcmNmNmNcCmNgNgNmNgNcpgNepeShkeHlUIJlUlUlUpplUlUlUlUilhkgsGcZGnVhkYnjOaclhdytReFeFeFeFeFnQeFeFeFeFeFeFeFeFeFeFdzdzdzdzdzdzdzeFeFeFeFeFeFeFeFeFnQeFwfvUczaPaPaPaPoifoaPaPaPaPoifoaPaPaPaPoifoaPihihihihihihihmCmCmCXMaclOkYHWdzlOacacacacacmNgNmNmNmNmNmNmNmNmNmNlFmNmNmNmNeGmNmNmNdqmNmNmNmNmNeGmNfBmNmNfBmNhXmNmNmNmNmNmNmNmNhXmNmNmNwtmNmNmNblwtmNmNmNmNmNmNav
hPmcmcmcmcmcmcmcmcmcmNmNcCmNmNmNmNmNgNgNgNeSTwhkcPilhkurBXUWIHJHRiOmVGlUVFRiVKlUZPhkphOaacdZacaceFeFeFeFeFeFeFeFeFeFeFeFeFeFeFeFdzdzdzdzdzdzdzeFeFeFeFeFeFeFeFeFeFeFwyfhfEaPmOfGyolPbhaPmOfGyolPbhaPmOfGyolPbhaPBxmCmCmCmCmCmCmCmCmCLnaclOlOWnlOlOacacacmNgNmNmNmNwtmNmNmNmNmNmNmNlFmNmNmNmNmNmNmNmNyfmNmNmNmNmNmNmNmNmNmNmNmNhXmNmNmNmNmNmNmNmNmNdqmNmNmNmNmNmNblmNmNmNmNmNeGmNav
hPmcmcmcmcmcmcmcmcmcmNmNmNmNmNmNmNgNgNAOgNeSTwhkcPlUhkFZeeewpvyCRiOmVGuchkFAyblUZPhkYahWacdyPUacXyPfrKTfFaKleFkEkEkEkEkEeFeFeFeFeFeFeFeFeFeFeFeFeFeFeFkCkCkCkCkCeFeFfVocfEaPbhlPlPlPQEaPbhlPlPlPpxaPbhlPlPlPxKaPmCmCmCmCmCmCmCmCmCSBgyacBVMnacacacacmNgNmNmNmNmNmNcCmNmNmNmNmNeGmNlFmNmNmNmNmNmNmNmNaFmNmNmNmNmNmNmNmNeGmNeGmNmNmNmNmNmNmNmNmNmNmNmNmNmNmNmNmNmNblmNmNaFmNmNmNmNav

2
maps/southern_cross/southern_cross.dm
View File

@@ -50,7 +50,7 @@
#include "southern_cross-9.dmm"
#include "southern_cross-10.dmm"
//CHOMPStation Edit End
#include "southern_cross-casino.dmm" //CHOMPedit: Disabled to save resources and loaded in during events - Jack
//#include "southern_cross-casino.dmm" //CHOMPedit: Disabled to save resources and loaded in during events - Jack
#include "submaps/_southern_cross_submaps.dm"

39
tgui/packages/tgui/interfaces/Cleanbot.js
View File

@@ -12,6 +12,7 @@ export const Cleanbot = (props, context) => {
version,
blood,
patrol,
vocal,
wet_floors,
spray_blood,
rgbpanel,
@@ -42,13 +43,37 @@ export const Cleanbot = (props, context) => {
</Section>
{!locked && (
<Section title="Behavior Controls">
<Button
fluid
icon={blood ? "toggle-on" : "toggle-off"}
selected={blood}
onClick={() => act("blood")}>
{blood ? "Cleans Blood" : "Ignores Blood"}
</Button>
<LabeledList>
<LabeledList.Item label="Blood">
<Button
fluid
icon={blood ? "toggle-on" : "toggle-off"}
selected={blood}
onClick={() => act("blood")}>
{blood ? "Clean" : "Ignore"}
</Button>
</LabeledList.Item>
<LabeledList.Item label="Speaker">
<Button
fluid
icon={vocal ? "toggle-on" : "toggle-off"}
selected={vocal}
onClick={() => act("vocal")}>
{vocal ? "On" : "Off"}
</Button>
</LabeledList.Item>
{/* VOREStation Edit: Not really used on Vore.*/}
{/* <LabeledList.Item label="Patrol">
<Button
fluid
icon={patrol ? "toggle-on" : "toggle-off"}
selected={patrol}
onClick={() => act("patrol")}>
{patrol ? "On" : "Off"}
</Button>
</LabeledList.Item> */}
{/* VOREStation Edit End */}
</LabeledList>
</Section>
) || null}
{(!locked && open) && (

9
tgui/packages/tgui/interfaces/Floorbot.js
View File

@@ -9,6 +9,7 @@ export const Floorbot = (props, context) => {
on,
open,
locked,
vocal,
amount,
possible_bmode,
improvefloors,
@@ -43,6 +44,14 @@ export const Floorbot = (props, context) => {
{!locked && (
<Section title="Behavior Controls">
<LabeledList>
<LabeledList.Item label="Speaker">
<Button
icon={vocal ? "toggle-on" : "toggle-off"}
selected={vocal}
onClick={() => act("vocal")}>
{vocal ? "On" : "Off"}
</Button>
</LabeledList.Item>
<LabeledList.Item label="Improves Floors">
<Button
icon={improvefloors ? "toggle-on" : "toggle-off"}

11
tgui/packages/tgui/interfaces/Secbot.js
View File

@@ -14,7 +14,8 @@ export const Secbot = (props, context) => {
check_arrest,
arrest_type,
declare_arrests,
will_patrol,
bot_patrolling,
patrol,
} = data;
return (
@@ -80,13 +81,13 @@ export const Secbot = (props, context) => {
{declare_arrests ? "Yes" : "No"}
</Button>
</LabeledList.Item>
{will_patrol && (
{!!bot_patrolling && (
<LabeledList.Item label="Auto Patrol">
<Button
icon={will_patrol ? "toggle-on" : "toggle-off"}
selected={will_patrol}
icon={patrol ? "toggle-on" : "toggle-off"}
selected={patrol}
onClick={() => act("patrol")}>
{will_patrol ? "Yes" : "No"}
{patrol ? "Yes" : "No"}
</Button>
</LabeledList.Item>
)}

2
tgui/packages/tgui/public/tgui.bundle.js
View File

File diff suppressed because one or more lines are too long