cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-27 22:17:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1295 from FalseIncarnate/master

Browse Source 
[Feature][Sprites][Map Edit] Aquariums and Pet Rocks!
This commit is contained in:
ZomgPonies
2015-06-13 04:21:07 -04:00
parent bb02973e49 25b9283717
commit f70106a344
18 changed files with 1078 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/supplypacks.dm
+76 -43
View File
@@ -14,8 +14,9 @@ var/const/supply_science = 5
var/const/supply_organic = 6
var/const/supply_materials = 7
var/const/supply_misc = 8
var/const/supply_vend = 9
var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engineer,supply_medical,supply_science,supply_organic,supply_materials,supply_misc)
var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engineer,supply_medical,supply_science,supply_organic,supply_materials,supply_misc,supply_vend)
/proc/get_supply_group_name(var/cat)
switch(cat)
@@ -35,6 +36,8 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine
return "Raw Materials"
if(8)
return "Miscellaneous"
if(9)
return "Vending"
/datum/supply_packs
@@ -961,17 +964,6 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine
containername = "Beekeeping crate"
access = access_hydroponics
/datum/supply_packs/organic/vending
name = "Bartending Supply Crate"
contains = list(/obj/item/weapon/vending_refill/boozeomat,
/obj/item/weapon/vending_refill/boozeomat,
/obj/item/weapon/vending_refill/boozeomat,
/obj/item/weapon/vending_refill/coffee,
/obj/item/weapon/vending_refill/coffee,
/obj/item/weapon/vending_refill/coffee)
cost = 20
containername = "bartending supply crate"
/datum/supply_packs/organic/foodcart
name = "Food Cart crate"
contains = list(/obj/structure/foodcart)
@@ -979,30 +971,6 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine
containertype = /obj/structure/largecrate
containername = "food cart crate"
/datum/supply_packs/organic/vending/snack
name = "Snack Supply Crate"
contains = list(/obj/item/weapon/vending_refill/snack,
/obj/item/weapon/vending_refill/snack,
/obj/item/weapon/vending_refill/snack)
cost = 15
containername = "snacks supply crate"
/datum/supply_packs/organic/vending/cola
name = "Softdrinks Supply Crate"
contains = list(/obj/item/weapon/vending_refill/cola,
/obj/item/weapon/vending_refill/cola,
/obj/item/weapon/vending_refill/cola)
cost = 15
containername = "softdrinks supply crate"
/datum/supply_packs/organic/vending/cigarette
name = "Cigarette Supply Crate"
contains = list(/obj/item/weapon/vending_refill/cigarette,
/obj/item/weapon/vending_refill/cigarette,
/obj/item/weapon/vending_refill/cigarette)
cost = 15
containername = "cigarette supply crate"
//////////////////////////////////////////////////////////////////////////////
//////////////////////////// Materials ///////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
@@ -1306,13 +1274,6 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine
containername = "crate" //let's keep it subtle, eh?
contraband = 1
/datum/supply_packs/misc/autodrobe
name = "Autodrobe Supply Crate"
contains = list(/obj/item/weapon/vending_refill/autodrobe,
/obj/item/weapon/vending_refill/autodrobe)
cost = 15
containername = "autodrobe supply crate"
/datum/supply_packs/misc/formalwear //This is a very classy crate.
name = "Formal-wear Crate"
contains = list(/obj/item/clothing/under/blacktango,
@@ -1378,3 +1339,75 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine
/obj/item/weapon/beach_ball)
cost = 20
containername = "polo supply crate"
//////////////////////////////////////////////////////////////////////////////
//////////////////////////// Vending /////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
/datum/supply_packs/vending
name = "HEADER"
group = supply_vend
/datum/supply_packs/vending/autodrobe
name = "Autodrobe Supply Crate"
contains = list(/obj/item/weapon/vending_refill/autodrobe,
/obj/item/weapon/vending_refill/autodrobe)
cost = 15
containername = "autodrobe supply crate"
/datum/supply_packs/vending/clothes
name = "Clothing Supply Crate"
contains = list(/obj/item/weapon/vending_refill/suitdispenser,
/obj/item/weapon/vending_refill/shoedispenser,
/obj/item/weapon/vending_refill/hatdispenser,
/obj/item/weapon/vending_refill/clothing)
cost = 15
containername = "clothing supply crate"
/datum/supply_packs/vending/pets
name = "Pet Supply Crate"
contains = list(/obj/item/weapon/vending_refill/crittercare,
/obj/item/weapon/vending_refill/crittercare)
cost = 15
containername = "pet supply crate"
/datum/supply_packs/vending/bar
name = "Bar Supply Crate"
contains = list(/obj/item/weapon/vending_refill/boozeomat,
/obj/item/weapon/vending_refill/boozeomat,
/obj/item/weapon/vending_refill/boozeomat)
cost = 15
containername = "bar supply crate"
/datum/supply_packs/vending/coffee
name = "Coffee Supply Crate"
contains = list(/obj/item/weapon/vending_refill/coffee,
/obj/item/weapon/vending_refill/coffee,
/obj/item/weapon/vending_refill/coffee)
cost = 15
containername = "coffee supply crate"
/datum/supply_packs/vending/snack
name = "Snack Supply Crate"
contains = list(/obj/item/weapon/vending_refill/snack,
/obj/item/weapon/vending_refill/snack,
/obj/item/weapon/vending_refill/snack)
cost = 15
containername = "snacks supply crate"
/datum/supply_packs/vending/cola
name = "Softdrinks Supply Crate"
contains = list(/obj/item/weapon/vending_refill/cola,
/obj/item/weapon/vending_refill/cola,
/obj/item/weapon/vending_refill/cola)
cost = 15
containername = "softdrinks supply crate"
/datum/supply_packs/vending/cigarette
name = "Cigarette Supply Crate"
contains = list(/obj/item/weapon/vending_refill/cigarette,
/obj/item/weapon/vending_refill/cigarette,
/obj/item/weapon/vending_refill/cigarette)
cost = 15
containername = "cigarette supply crate"