The Hat crate is now complete and ready for use, have fun collecting your hats.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1861 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
Superxpdude@gmail.com
2011-07-16 01:50:59 +00:00
parent f08289f3c9
commit b8f095a16b
3 changed files with 121 additions and 48 deletions
+77 -16
View File
@@ -339,23 +339,32 @@
name = "Collectable Hat"
desc = "A rare collectable hat."
/obj/item/clothing/head/collectable/petehat
name = "Ultra Rare! Pete's Hat!"
desc = "It smells faintly of plasma"
icon_state = "petehat"
/obj/item/clothing/head/collectable/metroid
name = "Collectable Metroid Cap!"
desc = "It just latches right in place!"
icon_state = "metroid"
/obj/item/clothing/head/collectable/xenom
name = "Collectable Xenomorph Helmet!"
desc = "Hiss hiss hiss!"
icon_state = "xenom"
/obj/item/clothing/head/collectable/chef
name = "Collectable Chef's Hat"
desc = "A rare chef's hat meant for hat collectors."
desc = "A rare Chef's Hat meant for hat collectors!"
icon_state = "chef"
item_state = "chef"
/obj/item/clothing/head/collectable/paper
name = "Collectable Paper Hat"
desc = "What looks like an ordinary paper hat, is actually a rare and valuable collector's edition paper hat. Keep away from water."
desc = "What looks like an ordinary paper hat, is actually a rare and valuable collector's edition paper hat. Keep away from water, fire and Librarians."
icon_state = "paper"
/obj/item/clothing/head/collectable/swat
name = "Collectable SWAT Helmet"
desc = "Has a tag on the inside 'A genuine Collector's SWAT Helmet. Not for use as protective headgear.'"
icon_state = "swat"
item_state = "swat"
/obj/item/clothing/head/collectable/tophat
name = "Collectable Top Hat"
desc = "A top hat worn by only the most prestigious hat collectors."
@@ -368,12 +377,6 @@
icon_state = "captain"
item_state = "caphat"
/obj/item/clothing/head/collectable/centcom
name = "Collectable Centcom Hat"
desc = "A Collectable replica of a centcom official's hat."
icon_state = "centcom"
item_state = "centhat"
/obj/item/clothing/head/collectable/police
name = "Collectable Police Officer's Hat"
desc = "A Collectable Police Officer's Hat. This hat emphasizes that you are THE LAW."
@@ -381,15 +384,73 @@
/obj/item/clothing/head/collectable/beret
name = "Collectable Beret"
desc = "A Collectable red beret."
desc = "A Collectable red Beret. It smells faintly of Garlic."
icon_state = "beret"
/obj/item/clothing/head/collectable/welding
name = "Collectable Welding Helmet"
desc = "A Collectable Welding Helmet. Now with 80% less lead! Not for actual welding."
desc = "A Collectable Welding Helmet. Now with 80% less lead! Not for actual welding. Any welding done while wearing this Helmet is done so at the owner's own risk!"
icon_state = "welding"
item_state = "welding"
/obj/item/clothing/head/collectable/slime
name = "Collectable Slime Hat"
desc = "Just like a real Brain Slug!"
icon_state = "headslime"
item_state = "headslime"
/obj/item/clothing/head/collectable/flatcap
name = "Collectable Flat Cap"
desc = "A Collectible farmer's Flat Cap!"
icon_state = "flat_cap"
item_state = "detective"
/obj/item/clothing/head/collectable/pirate
name = "Collectable Pirate Hat"
desc = "You'd make a great Dread Syndie Roberts!"
icon_state = "pirate"
item_state = "pirate"
/obj/item/clothing/head/collectable/kitty
name = "Collectable Kitty Ears"
desc = "The fur feels.....a bit too realistic."
icon_state = "kitty"
item_state = "kitty"
/obj/item/clothing/head/collectable/rabbitears
name = "Collectable Rabbit Ears"
desc = "Not as lucky as the feet!"
icon_state = "bunny"
item_state = "bunny"
/obj/item/clothing/head/collectable/wizard
name = "Collectable Wizard's Hat"
desc = "NOTE:Any magical powers gained from wearing this hat are purely coincidental."
icon_state = "wizard"
/obj/item/clothing/head/collectable/hardhat
name = "Collectable Hard Hat"
desc = "WARNING! Offers no real protection, or luminosity, but it is damn fancy!"
icon_state = "hardhat0_yellow"
item_state = "hardhat0_yellow"
/obj/item/clothing/head/collectable/HoS
name = "Collectable HoS Hat"
desc = "Now you can beat prisoners, set silly sentences and arrest for no reason too!"
icon_state = "hoscap"
/obj/item/clothing/head/collectable/thunderdome
name = "Collectable Thunderdome helmet"
desc = "Go Red! I mean Green! I mean Red! No Green!"
icon_state = "thunderdome"
item_state = "thunderdome"
/obj/item/clothing/head/collectable/swat
name = "Collectable SWAT Helmet"
desc = "Now you can be in the Deathsquad too!"
icon_state = "swat"
item_state = "swat"
//obj/item/clothing/head/collectable
+38 -26
View File
@@ -430,10 +430,7 @@
cost = 20
containertype = "/obj/crate/secure/gear"
containername = "Secruity Barriers crate"
access = access_security
//HATS
/*
datum/supply_packs/hats/New()
var/list/tempContains = list("/obj/item/clothing/head/collectable/chef",
"/obj/item/clothing/head/collectable/chef",
@@ -444,45 +441,60 @@ datum/supply_packs/hats/New()
"/obj/item/clothing/head/collectable/tophat",
"/obj/item/clothing/head/collectable/tophat",
"/obj/item/clothing/head/collectable/tophat",
"/obj/item/clothing/head/collectable/swat",
"/obj/item/clothing/head/collectable/swat",
"/obj/item/clothing/head/collectable/swat",
"/obj/item/clothing/head/collectable/captain",
"/obj/item/clothing/head/collectable/captain",
"/obj/item/clothing/head/collectable/captain",
"/obj/item/clothing/head/collectable/centcom",
"/obj/item/clothing/head/collectable/centcom",
"/obj/item/clothing/head/collectable/centcom",
"/obj/item/clothing/head/collectable/police",
"/obj/item/clothing/head/collectable/police",
"/obj/item/clothing/head/collectable/police",
"/obj/item/clothing/head/collectable/beret",
"/obj/item/clothing/head/collectable/beret",
"/obj/item/clothing/head/collectable/beret",
"/obj/item/clothing/head/collectable/welding",
"/obj/item/clothing/head/collectable/welding",
"/obj/item/clothing/head/collectable/welding",
"hat10",
"hat11",
"hat12",
"hat13",
"hat14",
"hat15",
"hat16",
"hat17",
"hat18",
"hat19",
"hat20",)
"/obj/item/clothing/head/collectable/flatcap",
"/obj/item/clothing/head/collectable/flatcap",
"/obj/item/clothing/head/collectable/flatcap",
"/obj/item/clothing/head/collectable/pirate",
"/obj/item/clothing/head/collectable/pirate",
"/obj/item/clothing/head/collectable/pirate",
"/obj/item/clothing/head/collectable/kitty",
"/obj/item/clothing/head/collectable/kitty",
"/obj/item/clothing/head/collectable/kitty",
"/obj/item/clothing/head/collectable/rabbitears",
"/obj/item/clothing/head/collectable/rabbitears",
"/obj/item/clothing/head/collectable/rabbitears",
"/obj/item/clothing/head/collectable/wizard",
"/obj/item/clothing/head/collectable/wizard",
"/obj/item/clothing/head/collectable/wizard",
"/obj/item/clothing/head/collectable/hardhat",
"/obj/item/clothing/head/collectable/hardhat",
"/obj/item/clothing/head/collectable/hardhat",
"/obj/item/clothing/head/collectable/HoS",
"/obj/item/clothing/head/collectable/HoS",
"/obj/item/clothing/head/collectable/HoS",
"/obj/item/clothing/head/collectable/thunderdome",
"/obj/item/clothing/head/collectable/thunderdome",
"/obj/item/clothing/head/collectable/thunderdome",
"/obj/item/clothing/head/collectable/swat",
"/obj/item/clothing/head/collectable/swat",
"/obj/item/clothing/head/collectable/swat",
"/obj/item/clothing/head/collectable/metroid",
"/obj/item/clothing/head/collectable/metroid",
"/obj/item/clothing/head/collectable/police",
"/obj/item/clothing/head/collectable/police",
"/obj/item/clothing/head/collectable/slime",
"/obj/item/clothing/head/collectable/slime",
"/obj/item/clothing/head/collectable/xenom",
"/obj/item/clothing/head/collectable/xenom",
"/obj/item/clothing/head/collectable/petehat",)
for(var/i = 0,i<min(3,contains.len),i++)
tempContains += pick(contains)
contains = tempContains
..()
name = "Collectible Hat Crate!"
name = "Collectable Hat Crate!"
cost = 150
containertype = "/obj/crate/secure/gear"
containername = "Collectible Hats Crate! Brought to you by Bass.inc!"
containername = "Collectable Hats Crate! Brought to you by Bass.inc!"
access = access_crate_cash
*/
//SUPPLY PACKS
+6 -6
View File
@@ -4324,13 +4324,13 @@
"bFh" = (/obj/machinery/atmospherics/filter{dir = 4},/turf/simulated/floor,/area/atmos)
"bFi" = (/obj/machinery/atmospherics/portables_connector{dir = 8},/turf/simulated/floor,/area/atmos)
"bFj" = (/obj/machinery/atmospherics/portables_connector{dir = 4},/obj/machinery/light{dir = 1},/turf/simulated/floor,/area/atmos)
"bFk" = (/obj/machinery/atmospherics/pipe/manifold{dir = 1; icon_state = "manifold"; level = 2},/turf/simulated/floor,/area/atmos)
"bFk" = (/obj/machinery/atmospherics/pipe/manifold{dir = 1; icon_state = "manifold"; level = 2},/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 20},/turf/simulated/floor,/area/atmos)
"bFl" = (/obj/machinery/alarm{frequency = 1437; pixel_y = 23},/obj/machinery/atmospherics/portables_connector{dir = 8},/turf/simulated/floor,/area/atmos)
"bFm" = (/obj/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor,/area/atmos)
"bFn" = (/obj/machinery/pipedispenser,/turf/simulated/floor,/area/atmos)
"bFo" = (/obj/grille,/obj/window/reinforced{dir = 1},/obj/window/reinforced{dir = 4},/obj/window/reinforced{dir = 8},/turf/simulated/floor,/area/atmos)
"bFp" = (/obj/machinery/light{dir = 1},/obj/machinery/atmospherics/pipe/simple{color = "blue"; icon_state = "intact-b"; level = 2},/obj/machinery/meter,/turf/simulated/floor,/area/atmos)
"bFq" = (/obj/machinery/atmospherics/pipe/simple{color = "red"; icon_state = "intact-r"; level = 2},/obj/machinery/camera{c_tag = "Atmospherics North East"},/obj/machinery/meter,/turf/simulated/floor,/area/atmos)
"bFq" = (/obj/machinery/atmospherics/pipe/simple{color = "red"; icon_state = "intact-r"; level = 2},/obj/machinery/camera{c_tag = "Atmospherics North East"},/obj/machinery/meter,/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 20},/turf/simulated/floor,/area/atmos)
"bFr" = (/obj/machinery/atmospherics/pipe/simple{color = "cyan"; dir = 6; icon_state = "intact-c"; initialize_directions = 6; level = 2},/turf/simulated/floor,/area/atmos)
"bFs" = (/obj/machinery/atmospherics/pipe/simple{color = "cyan"; dir = 4; icon_state = "intact-c"; level = 2},/turf/simulated/floor,/area/atmos)
"bFt" = (/obj/machinery/atmospherics/binary/pump{dir = 8; icon_state = "intact_on"; name = "Air In"; on = 1},/turf/simulated/floor,/area/atmos)
@@ -4609,7 +4609,7 @@
"bKG" = (/obj/machinery/atmospherics/portables_connector{dir = 4},/obj/machinery/portable_atmospherics/pump,/obj/machinery/light{dir = 4},/turf/simulated/floor{icon_state = "arrival"; dir = 8},/area/hallway/primary/aft)
"bKH" = (/obj/machinery/atmospherics/pipe/manifold{color = "cyan"; dir = 4; icon_state = "manifold-c"; initialize_directions = 11; level = 2},/turf/simulated/wall,/area/maintenance/asmaint)
"bKI" = (/turf/simulated/wall/r_wall,/area/atmos)
"bKJ" = (/obj/machinery/atmospherics/pipe/simple{color = "cyan"; dir = 6; icon_state = "intact-c"; initialize_directions = 6; level = 2},/obj/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor,/area/atmos)
"bKJ" = (/obj/machinery/atmospherics/pipe/simple{color = "cyan"; dir = 6; icon_state = "intact-c"; initialize_directions = 6; level = 2},/obj/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = -30},/turf/simulated/floor,/area/atmos)
"bKK" = (/obj/grille,/obj/window/reinforced{dir = 8},/obj/window/reinforced{dir = 1},/obj/window/reinforced,/obj/machinery/atmospherics/pipe/manifold{color = "cyan"; dir = 1; icon_state = "manifold-c"; level = 2},/turf/simulated/floor,/area/atmos)
"bKL" = (/obj/machinery/atmospherics/pipe/simple{color = "cyan"; dir = 4; icon_state = "intact-c"; level = 2},/obj/grille,/obj/machinery/atmospherics/pipe/simple{color = "yellow"; icon_state = "intact-y"; level = 2},/obj/window/reinforced{dir = 1},/obj/window/reinforced,/turf/simulated/floor,/area/atmos)
"bKM" = (/obj/machinery/atmospherics/pipe/simple{color = "cyan"; dir = 4; icon_state = "intact-c"; level = 2},/obj/grille,/obj/window/reinforced{dir = 1},/obj/window/reinforced,/turf/simulated/floor,/area/atmos)
@@ -4858,7 +4858,7 @@
"bPv" = (/obj/machinery/atmospherics/pipe/simple{color = "blue"; icon_state = "intact-b"; level = 2},/obj/machinery/camera{c_tag = "Atmospherics Airlock"; dir = 1},/turf/simulated/floor,/area/atmos)
"bPw" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor,/area/atmos)
"bPx" = (/obj/machinery/atmospherics/pipe/simple{color = "red"; icon_state = "intact-r"; level = 2},/obj/machinery/requests_console{department = "Atmospherics"; departmentType = 4; name = "Atmos RC"; pixel_x = 30; pixel_y = 0},/turf/simulated/floor,/area/atmos)
"bPy" = (/obj/machinery/atmospherics/portables_connector{dir = 4},/obj/machinery/camera{c_tag = "Atmospherics Central"; dir = 4; network = "SS13"},/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor,/area/atmos)
"bPy" = (/obj/machinery/atmospherics/portables_connector{dir = 4},/obj/machinery/camera{c_tag = "Atmospherics Central"; dir = 4; network = "SS13"},/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = -30},/turf/simulated/floor,/area/atmos)
"bPz" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/obj/machinery/computer/general_air_control/large_tank_control{frequency = 1441; input_tag = "tox_in"; name = "Toxin Supply Control"; output_tag = "tox_out"; sensors = list("tox_sensor" = "Tank")},/turf/simulated/floor{dir = 4; icon_state = "warning"},/area/atmos)
"bPA" = (/obj/machinery/air_sensor{frequency = 1441; id_tag = "tox_sensor"},/turf/simulated/floor/engine{carbon_dioxide = 0; name = "plasma floor"; nitrogen = 0; oxygen = 0; toxins = 70000},/area/atmos)
"bPB" = (/obj/machinery/portable_atmospherics/canister/toxins,/turf/simulated/floor/engine{carbon_dioxide = 0; name = "plasma floor"; nitrogen = 0; oxygen = 0; toxins = 70000},/area/atmos)
@@ -4992,7 +4992,7 @@
"bRZ" = (/obj/machinery/atmospherics/pipe/simple,/turf/simulated/wall,/area/hallway/primary/aft)
"bSa" = (/obj/machinery/computer/arcade,/turf/simulated/floor,/area/atmos)
"bSb" = (/obj/showcase,/turf/simulated/floor,/area/atmos)
"bSc" = (/obj/closet/emcloset,/turf/simulated/floor,/area/atmos)
"bSc" = (/obj/closet/emcloset,/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 20},/turf/simulated/floor,/area/atmos)
"bSd" = (/obj/grille,/obj/window/reinforced{dir = 8},/obj/window/reinforced,/obj/window/reinforced{dir = 1},/obj/window/reinforced{dir = 4},/obj/machinery/atmospherics/pipe/simple{color = "blue"; dir = 4; icon_state = "intact-b"; level = 2},/turf/simulated/floor/plating,/area/atmos)
"bSe" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor,/area/atmos)
"bSf" = (/obj/machinery/atmospherics/binary/pump{dir = 8; icon_state = "intact_off"; name = "Tank to Filter"; on = 0},/turf/simulated/floor,/area/atmos)
@@ -5128,7 +5128,7 @@
"bUF" = (/obj/machinery/camera{c_tag = "Atmospherics Hawk's a knob room"; dir = 4; network = "SS13"},/turf/simulated/floor,/area/atmos)
"bUG" = (/obj/closet/extinguisher{pixel_x = 5; pixel_y = -32},/turf/simulated/floor,/area/atmos)
"bUH" = (/obj/machinery/atmospherics/pipe/simple{color = "blue"; icon_state = "intact-b"; level = 2},/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/floor,/area/atmos)
"bUI" = (/obj/machinery/camera{c_tag = "Atmospherics South West"; dir = 4; network = "SS13"},/obj/machinery/portable_atmospherics/pump,/turf/simulated/floor,/area/atmos)
"bUI" = (/obj/machinery/camera{c_tag = "Atmospherics South West"; dir = 4; network = "SS13"},/obj/machinery/portable_atmospherics/pump,/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = -30},/turf/simulated/floor,/area/atmos)
"bUJ" = (/obj/machinery/portable_atmospherics/scrubber,/turf/simulated/floor,/area/atmos)
"bUK" = (/obj/machinery/atmospherics/binary/pump{dir = 1; icon_state = "intact_on"; name = "N2 Out"; on = 1},/turf/simulated/floor,/area/atmos)
"bUL" = (/obj/machinery/atmospherics/filter{dir = 4; filter_type = 2; icon_state = "intact_on"; name = "Gas filter (N2 tank)"; on = 1},/turf/simulated/floor,/area/atmos)