Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Moves from SS13.dm Spawners to F13lootdrop.dm spawners #608

Merged
merged 4 commits into from
Feb 20, 2019
Merged

Moves from SS13.dm Spawners to F13lootdrop.dm spawners #608

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2e2ac00
Moves from SS13.dm Spawners to F13lootdrop spawners
JTGSZ Feb 19, 2019
64708b7
Going down lists.
JTGSZ Feb 19, 2019
45a03b6
Map Changes
JTGSZ Feb 19, 2019
642179a
Reload Travis
JTGSZ Feb 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,426 changes: 725 additions & 701 deletions _maps/map_files/BoxStation/BoxStation.dmm
View file
Open in desktop

Large diffs are not rendered by default.

44 changes: 21 additions & 23 deletions _maps/map_files/generic/CentCom.dmm
View file
Open in desktop

Large diffs are not rendered by default.

81 changes: 66 additions & 15 deletions code/game/objects/effects/spawners/f13lootdrop.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,40 +393,47 @@
. = ..()


/*/obj/effect/spawner/lootdrop/f13/armor/tier5 //TIER 5 ARMOR
/obj/effect/spawner/lootdrop/f13/armor/tier5 //TIER 5 ARMOR
name = "tier 5 armor"
lootcount = 1
lootcount = 2
var/loot1 = list(
/obj/item/clothing/suit/space/hardsuit/powerarmor/advanced
/obj/item/clothing/suit/armor/f13/power_armor/advanced,
/obj/item/clothing/head/helmet/power_armor/advanced
)

var/loot2 = list(
/obj/item/clothing/suit/space/hardsuit/powerarmor/advanced/mk2
/obj/item/clothing/suit/armor/f13/power_armor/advanced/mk2,
/obj/item/clothing/head/helmet/power_armor/advanced/mk2
)

var/loot3 = list(
/obj/item/clothing/suit/space/hardsuit/powerarmor/tesla
/obj/item/clothing/suit/armor/f13/power_armor/tesla,
/obj/item/clothing/head/helmet/power_armor/tesla
)

var/loot4 = list(
/obj/item/clothing/suit/space/hardsuit/powerarmor/t45d
/obj/item/clothing/suit/armor/f13/power_armor/t45d,
/obj/item/clothing/head/helmet/power_armor/t45d
)

var/loot5 = list(
/obj/item/clothing/suit/space/hardsuit/powerarmor/t51b
/obj/item/clothing/suit/armor/f13/power_armor/t51b,
/obj/item/clothing/head/helmet/power_armor/t51b
)

var/loot6 = list(
/obj/item/clothing/suit/space/hardsuit/powerarmor/t45d
/obj/item/clothing/suit/armor/f13/power_armor/t45d,
/obj/item/clothing/head/helmet/power_armor/t45d
)

var/loot7 = list(
/obj/item/clothing/suit/space/hardsuit/powerarmor/t45d
/obj/item/clothing/suit/armor/f13/power_armor/t45d,
/obj/item/clothing/head/helmet/power_armor/t45d
)

/obj/effect/spawner/lootdrop/f13/armor/tier5/Initialize(mapload) //on mapload, pick what shit to spawn
loot = pick(loot1, loot2, loot3, loot4, loot5, loot6, loot7)
. = ..()*/
. = ..()

/* ------------------------------------------------
---------------MEDICAL SPAWNERS-----------------
Expand Down Expand Up @@ -499,7 +506,6 @@
/obj/item/reagent_containers/hypospray/medipen/stimpak,
/obj/item/reagent_containers/medspray/styptic,
/obj/item/reagent_containers/medspray/silver_sulf,
/obj/item/reagent_containers/medspray/synthflesh,
/obj/item/reagent_containers/medspray/sterilizine
)

Expand Down Expand Up @@ -957,10 +963,11 @@
/obj/effect/spawner/lootdrop/f13/junkspawners //TIER 4 GARBAGE
name = "garbage spawner"
lootcount = 2
fan_out_items = TRUE

loot = list(
/obj/item/broken_bottle,
/obj/item/poster/wanted,
/obj/item/poster/random_official,
/obj/item/multitool,
/obj/item/cigbutt/cigarbutt,
/obj/item/trash/sosjerky,
Expand Down Expand Up @@ -988,6 +995,7 @@
/obj/item/stack/packageWrap,
/obj/item/dildo,
/obj/item/storage/box/matches,
/obj/item/reagent_containers/food/snacks/deadmouse,
/obj/item/toner,
/obj/item/tank/internals/oxygen,
/obj/item/storage/box/papersack,
Expand All @@ -1005,12 +1013,14 @@
/obj/item/reagent_containers/spray/spraytan,
/obj/item/reagent_containers/glass/bowl,
/obj/item/reagent_containers/spray/cleaner,
/obj/item/reagent_containers/glass/bucket
/obj/item/reagent_containers/glass/bucket,
/obj/item/poster/random_contraband
)

/obj/effect/spawner/lootdrop/f13/foodspawner //TIER 5 FOOD
name = "food spawner"
lootdoubles = TRUE
fan_out_items = TRUE

loot = list(
/obj/item/storage/box/ingredients/american,
Expand Down Expand Up @@ -1061,7 +1071,42 @@


/obj/effect/spawner/lootdrop/f13/foodspawner/Initialize(mapload) //on mapload, pick how many shit to spawn
lootcount = pick(2, 3)
lootcount = pick(1, 2)
. = ..()

/obj/effect/spawner/lootdrop/f13/alcoholspawner //TIER 7 ALCOHOL
name = "alcoholspawner"
lootdoubles = TRUE
fan_out_items = TRUE

loot = list(
/obj/item/reagent_containers/food/drinks/beer,
/obj/item/reagent_containers/food/drinks/ale,
/obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko,
/obj/item/reagent_containers/food/drinks/bottle/gin,
/obj/item/reagent_containers/food/drinks/bottle/hcider,
/obj/item/reagent_containers/food/drinks/bottle/whiskey,
/obj/item/reagent_containers/food/drinks/bottle/vodka,
/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka,
/obj/item/reagent_containers/food/drinks/bottle/tequila,
/obj/item/reagent_containers/food/drinks/bottle/patron,
/obj/item/reagent_containers/food/drinks/bottle/rum,
/obj/item/reagent_containers/food/drinks/bottle/vermouth,
/obj/item/reagent_containers/food/drinks/bottle/kahlua,
/obj/item/reagent_containers/food/drinks/bottle/goldschlager,
/obj/item/reagent_containers/food/drinks/bottle/cognac,
/obj/item/reagent_containers/food/drinks/bottle/wine,
/obj/item/reagent_containers/food/drinks/bottle/absinthe,
/obj/item/reagent_containers/food/drinks/bottle/absinthe/premium,
/obj/item/reagent_containers/food/drinks/bottle/lizardwine,
/obj/item/reagent_containers/food/drinks/bottle/hcider,
/obj/item/reagent_containers/food/drinks/bottle/grappa,
/obj/item/reagent_containers/food/drinks/bottle/sake,
/obj/item/reagent_containers/food/drinks/bottle/fernet
)

/obj/effect/spawner/lootdrop/f13/alcoholspawner/Initialize(mapload) //on mapload, pick how many shit to spawn
lootcount = pick(1, 2)
. = ..()

/obj/effect/spawner/lootdrop/f13/resourcespawner //now include R N G (TM) (higher number means it has a bigger spawn chance)
Expand Down Expand Up @@ -1206,4 +1251,10 @@
/obj/item/stack/f13Cash/random/bottle_cap/high = 10,
/obj/item/stack/f13Cash/random/ncr/med = 25,
/obj/item/stack/f13Cash/random/bottle_cap/med = 5,
)
)

/obj/effect/spawner/lootdrop/f13/deadrodent_or_brainwashdisk
name = "98% chance of deceased rodent"
loot = list(
/obj/item/reagent_containers/food/snacks/deadmouse = 49,
/obj/item/disk/surgery/brainwashing = 1)
16 changes: 8 additions & 8 deletions code/game/objects/effects/spawners/lootdrop.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@
/obj/item/circuitboard/machine/microwave,
/obj/item/circuitboard/machine/chem_dispenser/drinks,
/obj/item/circuitboard/machine/chem_dispenser/drinks/beer,
/obj/item/circuitboard/computer/slot_machine
/obj/item/circuitboard/computer/slot_machine
)

/obj/effect/spawner/lootdrop/techstorage/rnd
Expand All @@ -237,14 +237,14 @@
loot = list(
/obj/item/circuitboard/computer/aifixer,
/obj/item/circuitboard/machine/rdserver,
/obj/item/circuitboard/computer/pandemic,
/obj/item/circuitboard/computer/pandemic,
/obj/item/circuitboard/machine/mechfab,
/obj/item/circuitboard/machine/circuit_imprinter/department,
/obj/item/circuitboard/computer/teleporter,
/obj/item/circuitboard/machine/destructive_analyzer,
/obj/item/circuitboard/machine/destructive_analyzer,
/obj/item/circuitboard/computer/rdconsole
)

/obj/effect/spawner/lootdrop/techstorage/security
name = "security circuit board spawner"
lootcount = 3
Expand All @@ -253,13 +253,13 @@
/obj/item/circuitboard/computer/security,
/obj/item/circuitboard/computer/prisoner
)

/obj/effect/spawner/lootdrop/techstorage/engineering
name = "engineering circuit board spawner"
lootcount = 3
loot = list(
/obj/item/circuitboard/computer/atmos_alert,
/obj/item/circuitboard/computer/stationalert,
/obj/item/circuitboard/computer/stationalert,
/obj/item/circuitboard/computer/powermonitor
)

Expand Down Expand Up @@ -300,7 +300,7 @@
/obj/item/circuitboard/computer/borgupload,
/obj/item/circuitboard/aicore
)

/obj/effect/spawner/lootdrop/techstorage/command
name = "secure command circuit board spawner"
lootcount = 3
Expand All @@ -309,7 +309,7 @@
/obj/item/circuitboard/computer/communications,
/obj/item/circuitboard/computer/card
)

/obj/effect/spawner/lootdrop/techstorage/RnD_secure
name = "secure RnD circuit board spawner"
lootcount = 3
Expand Down
Loading