Revert "Bay update."

This commit is contained in:
Zuhayr
2016-02-07 16:07:05 +10:30
parent 2d2e60f6c6
commit 98d983577c
136 changed files with 1512 additions and 1162 deletions

View File

@@ -158,7 +158,6 @@
spawn(5) // And wait a half-second, since it sounds like you can do this too fast.
if(src)
winset(src, null, "command=\".configure graphics-hwmode off\"")
sleep(2) // wait a bit more, possibly fixes hardware mode not re-activating right
winset(src, null, "command=\".configure graphics-hwmode on\"")
log_client_to_db()

View File

@@ -368,4 +368,4 @@ datum/preferences
user << browse(dat, "window=saves;size=300x390")
/datum/preferences/proc/close_load_dialog(mob/user)
user << browse(null, "window=saves")
user << browse(null, "window=saves")

View File

@@ -25,7 +25,7 @@ var/global/list/home_system_choices = list(
"Vir",
"Nyx",
"Tau Ceti",
"Epsilon Ursae Minoris",
"Epsilon Ursae Majoris",
"S'randarr"
)

View File

@@ -18,17 +18,7 @@ var/global/list/gear_datums = list()
//create a list of gear datums to sort
for(var/type in typesof(/datum/gear)-/datum/gear)
var/datum/gear/G = type
if(!initial(G.display_name))
error("Loadout - Missing display name: [G]")
continue
if(!initial(G.cost))
error("Loadout - Missing cost: [G]")
continue
if(!initial(G.path))
error("Loadout - Missing path definition: [G]")
continue
G = new G()
var/datum/gear/G = new type()
var/category = (G.sort_category in sort_categories)? G.sort_category : "unknown"
sort_categories[category][G.display_name] = G
@@ -220,7 +210,7 @@ var/global/list/gear_datums = list()
cost = 1
slot = slot_head
/datum/gear/bowler
/datum/gear/bowler
display_name = "hat, bowler"
path = /obj/item/clothing/head/bowler
cost = 1
@@ -601,7 +591,7 @@ var/global/list/gear_datums = list()
cost = 1
allowed_roles = list("Quartermaster","Cargo Technician")
/datum/gear/pants
/datum/gear/white
display_name = "pants, white"
path = /obj/item/clothing/under/pants/white
slot = slot_w_uniform
@@ -651,55 +641,55 @@ var/global/list/gear_datums = list()
display_name = "pants, young folks jeans"
path = /obj/item/clothing/under/pants/youngfolksjeans
/datum/gear/jeans
/datum/gear/shorts/jeans
display_name = "shorts, jeans"
path = /obj/item/clothing/under/shorts/jeans
slot = slot_w_uniform
cost = 1
/datum/gear/jeans/classic
/datum/gear/shorts/jeans/classic
display_name = "shorts, classic jeans"
path = /obj/item/clothing/under/shorts/jeans/classic
/datum/gear/jeans/mustang
/datum/gear/shorts/jeans/mustang
display_name = "shorts, mustang jeans"
path = /obj/item/clothing/under/shorts/jeans/mustang
/datum/gear/jeans/youngfolks
/datum/gear/shorts/jeans/youngfolks
display_name = "shorts, young folks jeans"
path = /obj/item/clothing/under/shorts/jeans/youngfolks
/datum/gear/jeans/black
/datum/gear/shorts/jeans/black
display_name = "shorts, black jeans"
path = /obj/item/clothing/under/shorts/jeans/black
/datum/gear/jeans/female
/datum/gear/shorts/jeans/female
display_name = "shorts, female, jeans"
path = /obj/item/clothing/under/shorts/jeans/female
/datum/gear/jeans/classic/female
/datum/gear/shorts/jeans/classic/female
display_name = "shorts, female, classic jeans"
path = /obj/item/clothing/under/shorts/jeans/classic/female
/datum/gear/jeans/mustang/female
/datum/gear/shorts/jeans/mustang/female
display_name = "shorts, female, mustang jeans"
path = /obj/item/clothing/under/shorts/jeans/mustang/female
/datum/gear/jeans/youngfolks/female
/datum/gear/shorts/jeans/youngfolks/female
display_name = "shorts, female, young folks jeans"
path = /obj/item/clothing/under/shorts/jeans/youngfolks/female
/datum/gear/jeans/black/female
/datum/gear/shorts/jeans/black/female
display_name = "shorts, female, black jeans"
path = /obj/item/clothing/under/shorts/jeans/black/female
/datum/gear/khaki
/datum/gear/shorts/khaki
display_name = "shorts, khaki"
path = /obj/item/clothing/under/shorts/khaki
slot = slot_w_uniform
cost = 1
/datum/gear/khaki/female
/datum/gear/shorts/khaki/female
display_name = "shorts, female, khaki"
path = /obj/item/clothing/under/shorts/khaki/female
@@ -1258,7 +1248,7 @@ var/global/list/gear_datums = list()
slot = slot_wear_suit
whitelisted = "Tajara" // You do have a monopoly on a fur suit tho
/datum/gear/forensics
/datum/gear/forensics/red
display_name = "forensics long, red"
path = /obj/item/clothing/suit/storage/forensics/red/long
cost = 2
@@ -1662,11 +1652,11 @@ var/global/list/gear_datums = list()
display_name = "skrell headtail-wear, male, blue, cloth"
path = /obj/item/clothing/ears/skrell/cloth_male/blue
/datum/gear/skrell_cloth/male/green
/datum/gear/skrell_cloth_male/green
display_name = "skrell headtail-wear, male, green, cloth"
path = /obj/item/clothing/ears/skrell/cloth_male/green
/datum/gear/skrell_cloth/male/pink
/datum/gear/skrell_cloth_male/pink
display_name = "skrell headtail-wear, male, pink, cloth"
path = /obj/item/clothing/ears/skrell/cloth_male/pink
@@ -1674,18 +1664,18 @@ var/global/list/gear_datums = list()
display_name = "skrell headtail-wear, female, red, cloth"
path = /obj/item/clothing/ears/skrell/cloth_female
/datum/gear/skrell_cloth/female/black
/datum/gear/skrell_cloth_female/black
display_name = "skrell headtail-wear, female, black, cloth"
path = /obj/item/clothing/ears/skrell/cloth_female/black
/datum/gear/skrell_cloth/female/blue
/datum/gear/skrell_cloth_female/blue
display_name = "skrell headtail-wear, female, blue, cloth"
path = /obj/item/clothing/ears/skrell/cloth_female/blue
/datum/gear/skrell_cloth/female/green
/datum/gear/skrell_cloth_female/green
display_name = "skrell headtail-wear, female, green, cloth"
path = /obj/item/clothing/ears/skrell/cloth_female/green
/datum/gear/skrell_cloth/female/pink
/datum/gear/skrell_cloth_female/pink
display_name = "skrell headtail-wear, female, pink, cloth"
path = /obj/item/clothing/ears/skrell/cloth_female/pink

View File

@@ -90,4 +90,4 @@
return 1
#undef SAVEFILE_VERSION_MAX
#undef SAVEFILE_VERSION_MIN
#undef SAVEFILE_VERSION_MIN