cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-27 23:27:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove dupe file, remove colon cancer and add prespawned stacks

Browse Source
This commit is contained in:
Bjorn Neergaard
2016-02-08 01:16:30 -06:00
parent 209fa5ffe6
commit f19feb4505
7 changed files with 73 additions and 1375 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/supplypacks.dm
-1322
View File
File diff suppressed because it is too large Load Diff
code/game/objects/items/stacks/sheets/glass.dm
+3
View File
@@ -21,6 +21,9 @@
is_cyborg = 1
cost = 500
/obj/item/stack/sheet/glass/fifty
amount = 50
/obj/item/stack/sheet/glass/attack_self(mob/user)
construct_window(user)
code/game/objects/items/stacks/sheets/mineral.dm
+13 -10
View File
@@ -15,12 +15,20 @@ Mineral Sheets
- Enriched Uranium
*/
/obj/item/stack/sheet/mineral
icon = 'icons/obj/mining.dmi'
/*
* Sandstone
*/
/obj/item/stack/sheet/mineral
icon = 'icons/obj/mining.dmi'
var/global/list/datum/stack_recipe/sandstone_recipes = list ( \
new/datum/stack_recipe("pile of dirt", /obj/machinery/hydroponics/soil, 3, time = 10, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("sandstone door", /obj/structure/mineral_door/sandstone, 10, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("Assistant Statue", /obj/structure/statue/sandstone/assistant, 5, one_per_turf = 1, on_floor = 1), \
/* new/datum/stack_recipe("sandstone wall", ???), \
new/datum/stack_recipe("sandstone floor", ???),\ */
)
/obj/item/stack/sheet/mineral/sandstone
name = "sandstone brick"
@@ -33,20 +41,15 @@ Mineral Sheets
materials = list(MAT_GLASS=MINERAL_MATERIAL_AMOUNT)
sheettype = "sandstone"
var/global/list/datum/stack_recipe/sandstone_recipes = list ( \
new/datum/stack_recipe("pile of dirt", /obj/machinery/hydroponics/soil, 3, time = 10, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("sandstone door", /obj/structure/mineral_door/sandstone, 10, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("Assistant Statue", /obj/structure/statue/sandstone/assistant, 5, one_per_turf = 1, on_floor = 1), \
/* new/datum/stack_recipe("sandstone wall", ???), \
new/datum/stack_recipe("sandstone floor", ???),\ */
)
/obj/item/stack/sheet/mineral/sandstone/New(var/loc, var/amount=null)
recipes = sandstone_recipes
pixel_x = rand(0,4)-4
pixel_y = rand(0,4)-4
..()
/obj/item/stack/sheet/mineral/sandstone/thirty
amount = 30
/*
* Diamond
*/
code/game/objects/items/stacks/sheets/sheet_types.dm
+19 -5
View File
@@ -57,6 +57,9 @@ var/global/list/datum/stack_recipe/metal_recipes = list ( \
flags = CONDUCT
origin_tech = "materials=1"
/obj/item/stack/sheet/metal/fifty
amount = 50
/obj/item/stack/sheet/metal/cyborg
materials = list()
is_cyborg = 1
@@ -66,13 +69,12 @@ var/global/list/datum/stack_recipe/metal_recipes = list ( \
recipes = metal_recipes
return ..()
/*
* Plasteel
*/
var/global/list/datum/stack_recipe/plasteel_recipes = list ( \
new/datum/stack_recipe("AI core", /obj/structure/AIcore, 4, time = 50, one_per_turf = 1), \
)
)
/obj/item/stack/sheet/plasteel
name = "plasteel"
@@ -86,8 +88,14 @@ var/global/list/datum/stack_recipe/plasteel_recipes = list ( \
origin_tech = "materials=2"
/obj/item/stack/sheet/plasteel/New(var/loc, var/amount=null)
recipes = plasteel_recipes
return ..()
recipes = plasteel_recipes
return ..()
/obj/item/stack/sheet/plasteel/twenty
amount = 20
/obj/item/stack/sheet/plasteel/fifty
amount = 50
/*
* Wood
@@ -122,6 +130,9 @@ var/global/list/datum/stack_recipe/wood_recipes = list ( \
recipes = wood_recipes
return ..()
/obj/item/stack/sheet/mineral/wood/fifty
amount = 50
/*
* Cloth
*/
@@ -160,9 +171,12 @@ var/global/list/datum/stack_recipe/cardboard_recipes = list ( \
recipes = cardboard_recipes
return ..()
/obj/item/stack/sheet/cardboard/fifty
amount = 50
/*
* Runed Metal
*/
*/
var/global/list/datum/stack_recipe/runed_metal_recipes = list ( \
new/datum/stack_recipe("pylon", /obj/structure/cult/pylon, 4, time = 40, one_per_turf = 1, on_floor = 1), \
code/game/objects/items/stacks/tiles/tile_types.dm
+2
View File
@@ -114,6 +114,8 @@
turf_type = /turf/simulated/floor/noslip
origin_tech = "materials=3"
/obj/item/stack/tile/noslip/thirty
amount = 30
//Plasteel (normal)
/obj/item/stack/tile/plasteel
code/modules/cargo/packs.dm
+35 -37
View File
@@ -1,24 +1,20 @@
/datum/supply_pack
var/name = null
var/group = supply_misc
var/name = "Crate"
var/group = ""
var/hidden = FALSE
var/contraband = FLASE
var/cost = 0
var/contraband = FALSE
var/cost = 7 // Minimum cost, or infinite points are possible.
var/access = FALSE
var/list/contains = null
var/amount = 0
var/crate_name = "crate"
var/crate_type = /obj/structure/closet/crate
var/crate_name = null
/datum/supply_pack/proc/generate(turf/T)
var/obj/structure/closet/crate/C = new crate_type(T)
C.name = crate_name
for(var/item in contains)
var/atom/A = new item(C)
if(amount && A.vars.Find("amount") && A:amount)
A:amount = amount
new item(C)
return C
//////////////////////////////////////////////////////////////////////////////
@@ -132,7 +128,7 @@
//////////////////////////////////////////////////////////////////////////////
/datum/supply_pack/security
group "Security"
group = "Security"
access = access_security
crate_type = /obj/structure/closet/crate/secure/gear
@@ -480,7 +476,7 @@
/datum/supply_pack/engineering/engine
name = "Emitter Crate"
cost = 10
access = access_ce
access = access_ce
contains = list(/obj/machinery/power/emitter,
/obj/machinery/power/emitter)
crate_name = "emitter crate"
@@ -810,11 +806,12 @@
/obj/item/clothing/tie/petcollar)
crate_name = "corgi crate"
/datum/supply_pack/organic/critter/corgi/New()
/datum/supply_pack/organic/critter/corgi/generate()
. = ..()
if(prob(50))
contains -= /mob/living/simple_animal/pet/dog/corgi
conmtains += /mob/living/simple_animal/pet/dog/corgi/Lisa
..()
var/mob/living/simple_animal/pet/dog/corgi/D = locate() in .
qdel(D)
new /mob/living/simple_animal/pet/dog/corgi/Lisa(.)
/datum/supply_pack/organic/critter/cat
name = "Cat Crate"
@@ -824,11 +821,12 @@
/obj/item/toy/cattoy)
crate_name = "cat crate"
/datum/supply_pack/organic/critter/cat/New()
/datum/supply_pack/organic/critter/cat/generate()
. = ..()
if(prob(50))
contains -= /mob/living/simple_animal/pet/cat
conmtains += /mob/living/simple_animal/pet/cat/Proc
..()
var/mob/living/simple_animal/pet/cat/C = locate() in .
qdel(C)
new /mob/living/simple_animal/pet/cat/Proc(.)
/datum/supply_pack/organic/critter/pug
name = "Pug Crate"
@@ -851,9 +849,10 @@
contains = list(/mob/living/simple_animal/butterfly)
crate_name = "butterflies crate"
/datum/supply_pack/organic/critter/butterfly/New()
for(var/i in 1 to 50)
contents += /mob/living/simple_animal/butterfly
/datum/supply_pack/organic/critter/butterfly/generate()
. = ..()
for(var/i in 1 to 49)
new /mob/living/simple_animal/butterfly(.)
/datum/supply_pack/organic/hydroponics
name = "Hydroponics Crate"
@@ -956,43 +955,43 @@
/datum/supply_pack/materials/metal50
name = "50 Metal Sheets"
cost = 10
contains = list(/obj/item/stack/sheet/metal)
amount = 50
contains = list(/obj/item/stack/sheet/metal/fifty)
crate_name = "metal sheets crate"
/datum/supply_pack/materials/plasteel20
name = "20 Plasteel Sheets"
cost = 30
contains = list(/obj/item/stack/sheet/plasteel)
amount = 20
contains = list(/obj/item/stack/sheet/plasteel/twenty)
crate_name = "plasteel sheets crate"
/datum/supply_pack/materials/plasteel50
name = "50 Plasteel Sheets"
cost = 50
contains = list(/obj/item/stack/sheet/plasteel)
amount = 50
contains = list(/obj/item/stack/sheet/plasteel/fifty)
crate_name = "plasteel sheets crate"
/datum/supply_pack/materials/glass50
name = "50 Glass Sheets"
cost = 10
contains = list(/obj/item/stack/sheet/glass)
amount = 50
contains = list(/obj/item/stack/sheet/glass/fifty)
crate_name = "glass sheets crate"
/datum/supply_pack/materials/wood50
name = "50 Wood Planks"
cost = 10
contains = list(/obj/item/stack/sheet/mineral/wood/fifty)
crate_name = "wood planks crate"
/datum/supply_pack/materials/cardboard50
name = "50 Cardboard Sheets"
cost = 10
contains = list(/obj/item/stack/sheet/cardboard)
amount = 50
contains = list(/obj/item/stack/sheet/cardboard/fifty)
crate_name = "cardboard sheets crate"
/datum/supply_pack/materials/sandstone30
name = "30 Sandstone Blocks"
cost = 20
contains = list(/obj/item/stack/sheet/mineral/sandstone)
amount = 30
contains = list(/obj/item/stack/sheet/mineral/sandstone/thirty)
crate_name = "sandstone blocks crate"
//////////////////////////////////////////////////////////////////////////////
@@ -1146,8 +1145,7 @@
/datum/supply_pack/misc/noslipfloor
name = "High-traction Floor Tiles"
cost = 20
contains = list(/obj/item/stack/tile/noslip)
amount = 20
contains = list(/obj/item/stack/tile/noslip/thirty)
crate_name = "high-traction floor tiles"
/datum/supply_pack/misc/plasmaman
tgstation.dme
+1 -1
View File
@@ -154,7 +154,6 @@
#include "code\datums\outfit.dm"
#include "code\datums\progressbar.dm"
#include "code\datums\recipe.dm"
#include "code\datums\supplypacks.dm"
#include "code\datums\votablemap.dm"
#include "code\datums\diseases\_disease.dm"
#include "code\datums\diseases\_MobProcs.dm"
@@ -894,6 +893,7 @@
#include "code\modules\awaymissions\mission_code\wildwest.dm"
#include "code\modules\cargo\console.dm"
#include "code\modules\cargo\order.dm"
#include "code\modules\cargo\packs.dm"
#include "code\modules\client\asset_cache.dm"
#include "code\modules\client\client defines.dm"
#include "code\modules\client\client procs.dm"