Skip to content

Commit

Permalink
Adds department wardrobe vendors to the code and to Boxstation. (tgst…
Browse files Browse the repository at this point in the history
…ation#37859)

* Adds wardrobe vending machines.

* Adds the refill cartridges to cargo.

* Removes access requierments and fixes spelling errors.

* More spelling errors fixed, curse the English language.

* Added sec skirts and grey uniforms to the sec vendor, and added formal uniforms as premium items to it.

* Fixing some grammer/spelling errors and adds the purple bartender uniform to the vendor.

* .

* Does Shizzy's requested changes.

* Adds these machines as options at the vendor circuit board. Adds more product ads.

* Fixes compile error.

* Sprite fix and two more things to the MediDrobe.

* adds the sprites

* Adds the vendors to box station.

* splits the supply packs up into different departments. Costs adjusted to be consistent with the autodrobe crate.
  • Loading branch information
Firecage authored and ninjanomnom committed May 21, 2018
1 parent a5dcc3f commit c1f10ae
Show file tree
Hide file tree
Showing 7 changed files with 501 additions and 35 deletions.
62 changes: 30 additions & 32 deletions _maps/map_files/BoxStation/BoxStation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2184,7 +2184,7 @@
pixel_x = 29
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/closet/wardrobe/red,
/obj/machinery/vending/wardrobe/sec_wardrobe,
/turf/open/floor/plasteel/showroomfloor,
/area/security/main)
"afe" = (
Expand Down Expand Up @@ -6891,7 +6891,7 @@
department = "Law office";
pixel_x = -32
},
/obj/structure/closet/lawcloset,
/obj/machinery/vending/wardrobe/law_wardrobe,
/turf/open/floor/wood,
/area/lawoffice)
"arb" = (
Expand Down Expand Up @@ -11225,8 +11225,8 @@
/turf/closed/wall,
/area/crew_quarters/theatre)
"aCs" = (
/obj/structure/closet/wardrobe/red,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/vending/wardrobe/sec_wardrobe,
/turf/open/floor/plasteel/red/side{
dir = 1
},
Expand Down Expand Up @@ -13097,10 +13097,10 @@
/turf/open/floor/plasteel,
/area/storage/primary)
"aHf" = (
/obj/structure/closet/wardrobe/chaplain_black,
/obj/item/radio/intercom{
pixel_y = 25
},
/obj/machinery/vending/wardrobe/chap_wardrobe,
/turf/open/floor/plasteel/grimy,
/area/chapel/office)
"aHg" = (
Expand Down Expand Up @@ -15224,7 +15224,7 @@
/area/library)
"aMI" = (
/obj/machinery/light/small,
/obj/structure/closet/wardrobe/botanist,
/obj/machinery/vending/wardrobe/hydro_wardrobe,
/turf/open/floor/plasteel/hydrofloor,
/area/hydroponics)
"aMJ" = (
Expand Down Expand Up @@ -15499,12 +15499,12 @@
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"aND" = (
/obj/structure/closet/gmcloset,
/obj/item/stack/sheet/metal/fifty,
/obj/item/stack/sheet/glass/fifty,
/obj/item/stack/cable_coil,
/obj/item/flashlight/lamp,
/obj/item/flashlight/lamp/green,
/obj/structure/table/wood,
/turf/open/floor/wood,
/area/crew_quarters/bar)
"aNE" = (
Expand Down Expand Up @@ -15592,7 +15592,7 @@
dir = 8;
pixel_x = 24
},
/obj/structure/closet/chefcloset,
/obj/machinery/vending/wardrobe/chef_wardrobe,
/turf/open/floor/plasteel/showroomfloor,
/area/crew_quarters/kitchen)
"aNP" = (
Expand Down Expand Up @@ -16130,12 +16130,6 @@
},
/turf/open/floor/engine/cult,
/area/library)
"aPj" = (
/obj/machinery/light_switch{
pixel_y = 28
},
/turf/open/floor/plasteel/dark,
/area/chapel/main)
"aPk" = (
/turf/open/floor/plasteel/chapel{
dir = 4
Expand Down Expand Up @@ -16527,8 +16521,8 @@
/turf/open/floor/wood,
/area/library)
"aQr" = (
/obj/structure/closet/wardrobe/curator,
/obj/machinery/light/small,
/obj/machinery/vending/wardrobe/curator_wardrobe,
/turf/open/floor/engine/cult,
/area/library)
"aQs" = (
Expand Down Expand Up @@ -22683,7 +22677,7 @@
/turf/open/floor/plasteel/white,
/area/medical/chemistry)
"bha" = (
/obj/structure/closet/secure_closet/chemical,
/obj/machinery/vending/wardrobe/chem_wardrobe,
/turf/open/floor/plasteel/white,
/area/medical/chemistry)
"bhb" = (
Expand Down Expand Up @@ -23632,7 +23626,7 @@
/obj/machinery/camera{
c_tag = "Cargo Bay North"
},
/obj/structure/closet/wardrobe/cargotech,
/obj/machinery/vending/wardrobe/cargo_wardrobe,
/turf/open/floor/plasteel,
/area/quartermaster/storage)
"bjp" = (
Expand Down Expand Up @@ -25797,6 +25791,9 @@
/obj/structure/extinguisher_cabinet{
pixel_x = 27
},
/obj/item/radio/headset/headset_sci{
pixel_x = -3
},
/turf/open/floor/plasteel,
/area/science/robotics/lab)
"bow" = (
Expand Down Expand Up @@ -27719,10 +27716,7 @@
/turf/open/floor/plasteel,
/area/quartermaster/office)
"bsW" = (
/obj/structure/closet/wardrobe/robotics_black,
/obj/item/radio/headset/headset_sci{
pixel_x = -3
},
/obj/machinery/vending/wardrobe/robo_wardrobe,
/turf/open/floor/plasteel/white,
/area/science/robotics/lab)
"bsX" = (
Expand Down Expand Up @@ -30308,7 +30302,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/obj/structure/closet/wardrobe/red,
/obj/machinery/vending/wardrobe/sec_wardrobe,
/turf/open/floor/plasteel/red/side,
/area/security/checkpoint/supply)
"byU" = (
Expand Down Expand Up @@ -30483,11 +30477,11 @@
/turf/open/floor/plasteel/white,
/area/medical/genetics)
"bzr" = (
/obj/structure/closet/wardrobe/genetics_white,
/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -29
},
/obj/machinery/vending/wardrobe/gene_wardrobe,
/turf/open/floor/plasteel/white,
/area/medical/genetics)
"bzs" = (
Expand Down Expand Up @@ -30729,7 +30723,7 @@
},
/area/medical/sleeper)
"bzV" = (
/obj/structure/closet/wardrobe/white/medical,
/obj/machinery/vending/wardrobe/medi_wardrobe,
/turf/open/floor/plasteel/white,
/area/medical/sleeper)
"bzW" = (
Expand Down Expand Up @@ -31023,7 +31017,7 @@
/obj/machinery/light{
dir = 8
},
/obj/structure/closet/wardrobe/red,
/obj/machinery/vending/wardrobe/sec_wardrobe,
/turf/open/floor/plasteel/red/side{
dir = 8
},
Expand Down Expand Up @@ -31151,7 +31145,7 @@
},
/area/quartermaster/qm)
"bAT" = (
/obj/structure/closet/jcloset,
/obj/machinery/vending/wardrobe/jani_wardrobe,
/turf/open/floor/plasteel,
/area/janitor)
"bAU" = (
Expand Down Expand Up @@ -34940,7 +34934,7 @@
/turf/open/floor/plasteel/white,
/area/science/research)
"bJU" = (
/obj/structure/closet/wardrobe/science_white,
/obj/machinery/vending/wardrobe/science_wardrobe,
/turf/open/floor/plasteel/white,
/area/science/mixing)
"bJV" = (
Expand Down Expand Up @@ -37677,7 +37671,7 @@
/obj/machinery/light{
dir = 4
},
/obj/structure/closet/wardrobe/red,
/obj/machinery/vending/wardrobe/sec_wardrobe,
/turf/open/floor/plasteel/red/side{
dir = 4
},
Expand Down Expand Up @@ -37768,7 +37762,7 @@
/turf/open/floor/plasteel/white,
/area/medical/virology)
"bQF" = (
/obj/structure/closet/wardrobe/virology_white,
/obj/machinery/vending/wardrobe/viro_wardrobe,
/turf/open/floor/plasteel/white,
/area/medical/virology)
"bQG" = (
Expand Down Expand Up @@ -42169,7 +42163,7 @@
/turf/open/floor/plating,
/area/maintenance/port/aft)
"cbz" = (
/obj/structure/closet/wardrobe/atmospherics_yellow,
/obj/machinery/vending/wardrobe/atmos_wardrobe,
/turf/open/floor/plasteel,
/area/engine/atmos)
"cbA" = (
Expand Down Expand Up @@ -44133,7 +44127,7 @@
c_tag = "Engineering East";
dir = 8
},
/obj/structure/closet/wardrobe/engineering_yellow,
/obj/machinery/vending/wardrobe/engi_wardrobe,
/turf/open/floor/plasteel/yellow/corner{
dir = 4
},
Expand Down Expand Up @@ -54137,6 +54131,10 @@
},
/turf/open/floor/plating,
/area/construction/mining/aux_base)
"wpP" = (
/obj/machinery/vending/wardrobe/bar_wardrobe,
/turf/open/floor/wood,
/area/crew_quarters/bar)
"wrp" = (
/obj/machinery/light{
dir = 8
Expand Down Expand Up @@ -91331,7 +91329,7 @@ aGL
aHM
aJm
aKz
aKR
wpP
aND
aJC
aab
Expand Down Expand Up @@ -100071,7 +100069,7 @@ aJT
aLc
aMX
aFw
aPj
aFz
aFz
aRR
aTe
Expand Down
17 changes: 17 additions & 0 deletions code/game/objects/items/circuitboards/machine_circuitboards.dm
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,23 @@
/obj/machinery/vending/cigarette = "ShadyCigs Deluxe",
/obj/machinery/vending/games = "\improper Good Clean Fun",
/obj/machinery/vending/autodrobe = "AutoDrobe",
/obj/machinery/vending/wardrobe/sec_wardrobe = "SecDrobe",
/obj/machinery/vending/wardrobe/medi_wardrobe = "MediDrobe",
/obj/machinery/vending/wardrobe/engi_wardrobe = "EngiDrobe",
/obj/machinery/vending/wardrobe/atmos_wardrobe = "AtmosDrobe",
/obj/machinery/vending/wardrobe/cargo_wardrobe = "CargoDrobe",
/obj/machinery/vending/wardrobe/robo_wardrobe = "RoboDrobe",
/obj/machinery/vending/wardrobe/science_wardrobe = "SciDrobe",
/obj/machinery/vending/wardrobe/hydro_wardrobe = "HyDrobe",
/obj/machinery/vending/wardrobe/curator_wardrobe = "CuraDrobe",
/obj/machinery/vending/wardrobe/bar_wardrobe = "BarDrobe",
/obj/machinery/vending/wardrobe/chef_wardrobe = "ChefDrobe",
/obj/machinery/vending/wardrobe/jani_wardrobe = "JaniDrobe",
/obj/machinery/vending/wardrobe/law_wardrobe = "LawDrobe",
/obj/machinery/vending/wardrobe/chap_wardrobe = "ChapDrobe",
/obj/machinery/vending/wardrobe/chem_wardrobe = "ChemDrobe",
/obj/machinery/vending/wardrobe/gene_wardrobe = "GeneDrobe",
/obj/machinery/vending/wardrobe/viro_wardrobe = "ViroDrobe",
/obj/machinery/vending/clothing = "ClothesMate",
/obj/machinery/vending/medical = "NanoMed Plus",
/obj/machinery/vending/wallmed = "NanoMed")
Expand Down
65 changes: 62 additions & 3 deletions code/modules/cargo/packs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -715,7 +715,7 @@

//////////////////////////////////////////////////////////////////////////////
//////////////////////// Engine Construction /////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////

/datum/supply_pack/engine
group = "Engine Construction"
Expand Down Expand Up @@ -851,7 +851,7 @@
crate_name = "supermatter shard crate"
crate_type = /obj/structure/closet/crate/secure/engineering
dangerous = TRUE

/datum/supply_pack/engine/tesla_coils
name = "Tesla Coil Crate"
desc = "Whether it's high-voltage executions, creating research points, or just plain old power generation: This pack of four Tesla coils can do it all!"
Expand Down Expand Up @@ -1406,7 +1406,7 @@
/obj/item/vending_refill/cola,
/obj/item/vending_refill/cola)
crate_name = "soft drinks supply crate"

//////////////////////////////////////////////////////////////////////////////
//////////////////////////// Organic /////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -1714,6 +1714,65 @@
/obj/item/vending_refill/autodrobe)
crate_name = "autodrobe supply crate"

/datum/supply_pack/costumes_toys/wardrobes/general
name = "General Wardrobes Supply Crate"
desc = "This crate contains refills for the CuraDrobe, BarDrobe, ChefDrobe, JaniDrobe, ChapDrobe."
cost = 3750
contains = list(/obj/item/vending_refill/wardrobe/curator_wardrobe,
/obj/item/vending_refill/wardrobe/bar_wardrobe,
/obj/item/vending_refill/wardrobe/chef_wardrobe,
/obj/item/vending_refill/wardrobe/jani_wardrobe,
/obj/item/vending_refill/wardrobe/chap_wardrobe)
crate_name = "general wardrobes vendor refills"

/datum/supply_pack/costumes_toys/wardrobes/cargo
name = "Cargo Department Supply Crate"
desc = "This crate contains a refill for the CargoDrobe."
cost = 750
contains = list(/obj/item/vending_refill/wardrobe/cargo_wardrobe)
crate_name = "cargo department supply crate"

/datum/supply_pack/costumes_toys/wardrobes/security
name = "Security Department Supply Crate"
desc = "This crate contains refills for the SecDrobe and LawDrobe."
cost = 1500
contains = list(/obj/item/vending_refill/wardrobe/sec_wardrobe,
/obj/item/vending_refill/wardrobe/law_wardrobe)
crate_name = "security department supply crate"

/datum/supply_pack/costumes_toys/wardrobes/medical
name = "Medical Department Wardrobe Supply Crate"
desc = "This crate contains refills for the MediDrobe, ChemDrobe, GeneDrobe, and ViroDrobe."
cost = 3000
contains = list(/obj/item/vending_refill/wardrobe/medi_wardrobe,
/obj/item/vending_refill/wardrobe/chem_wardrobe,
/obj/item/vending_refill/wardrobe/gene_wardrobe,
/obj/item/vending_refill/wardrobe/viro_wardrobe)
crate_name = "medical department wardrobe supply crate"

/datum/supply_pack/costumes_toys/wardrobes/engineering
name = "Engineering Department Wardrobe Supply Crate"
desc = "This crate contains refills for the EngiDrobe and AtmosDrobe."
cost = 1500
contains = list(/obj/item/vending_refill/wardrobe/engi_wardrobe,
/obj/item/vending_refill/wardrobe/atmos_wardrobe)
crate_name = "engineering department wardrobe supply crate"

/datum/supply_pack/costumes_toys/wardrobes/science
name = "Science Department Wardrobe Supply Crate"
desc = "This crate contains refills for the SciDrobe and RoboDrobe."
cost = 1500
contains = list(/obj/item/vending_refill/wardrobe/robo_wardrobe,
/obj/item/vending_refill/wardrobe/science_wardrobe)
crate_name = "science department wardrobe supply crate"

/datum/supply_pack/costumes_toys/wardrobes/hydroponics
name = "Hydrobe Supply Crate"
desc = "This crate contains a refill for the Hydrobe."
cost = 750
contains = list(/obj/item/vending_refill/wardrobe/hydro_wardrobe)
crate_name = "hydrobe supply crate"

/datum/supply_pack/costumes_toys/randomised
name = "Collectable Hats Crate"
desc = "Flaunt your status with three unique, highly-collectable hats!"
Expand Down
1 change: 1 addition & 0 deletions code/modules/vending/clothesmate.dm
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
name = "ClothesMate" //renamed to make the slogan rhyme
desc = "A vending machine for clothing."
icon_state = "clothes"
icon_deny = "clothes-deny"
product_slogans = "Dress for success!;Prepare to look swagalicious!;Look at all this free swag!;Why leave style up to fate? Use the ClothesMate!"
vend_reply = "Thank you for using the ClothesMate!"
products = list(/obj/item/clothing/head/that = 2,
Expand Down
Loading

0 comments on commit c1f10ae

Please sign in to comment.