Skip to content

Commit

Permalink
add: brand new items for Thunderdome and bundles (ss220-space#3722)
Browse files Browse the repository at this point in the history
  • Loading branch information
Vladisvell authored and NightDawnFox committed Oct 26, 2023
1 parent a830d10 commit 7c8b6fa
Show file tree
Hide file tree
Showing 3 changed files with 84 additions and 4 deletions.
70 changes: 70 additions & 0 deletions code/modules/thunderdome/items/special_kits.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
/**
* Here lie special thunderdome items.
* Absurdly strong or weak bundles included.
*/
/obj/item/storage/box/thunderdome
name = "Uncle Trasen's special gift"
desc = "You'll never know, what's inside."

/obj/item/storage/box/thunderdome/mr_chang_technique/populate_contents()
new /obj/item/mr_chang_technique(src)
new /obj/item/clothing/suit/mr_chang_coat(src)
new /obj/item/clothing/shoes/mr_chang_sandals(src)
new /obj/item/clothing/head/mr_chang_band(src)
var/obj/item/stack/spacecash/cash = new(src)
cash.amount = 50000
for(var/i = 0, i < 10, i++)
new /obj/item/coin/silver(src)

/obj/item/storage/box/thunderdome/mr_chang_technique/spicy/populate_contents()
new /obj/item/mr_chang_technique(src)
new /obj/item/clothing/suit/mr_chang_coat(src)
new /obj/item/clothing/shoes/mr_chang_sandals(src)
new /obj/item/clothing/head/mr_chang_band(src)
new /obj/item/melee/energy/axe(src)

/obj/item/storage/box/thunderdome/bombarda/populate_contents()
new /obj/item/gun/projectile/bombarda(src)
for(var/i = 0, i < 3, i++)
new /obj/item/ammo_casing/grenade/improvised/smoke_shell(src)
new /obj/item/ammo_casing/grenade/improvised/flame_shell(src)
new /obj/item/ammo_casing/grenade/improvised/exp_shell(src)

/obj/item/storage/box/thunderdome/crossbow/populate_contents()
var/obj/item/gun/throw/crossbow/cbow = new(src)
cbow.cell = new /obj/item/stock_parts/cell/infinite(cbow)
new /obj/item/weldingtool(src)
new /obj/item/arrow/rod/fire(src)
new /obj/item/arrow/rod/fire(src)
new /obj/item/arrow/rod/fire(src)
new /obj/item/arrow/rod(src)
new /obj/item/arrow/rod(src)
new /obj/item/arrow/rod(src)
new /obj/item/arrow/rod(src)

/obj/item/storage/box/thunderdome/crossbow/energy/populate_contents()
new /obj/item/gun/energy/kinetic_accelerator/crossbow(src)
new /obj/item/reagent_containers/hypospray/ertm/pentic_acid(src)

/obj/item/storage/box/thunderdome/spears/populate_contents()
new /obj/item/twohanded/spear(src)
new /obj/item/twohanded/spear(src)
new /obj/item/twohanded/spear(src)
new /obj/item/restraints/legcuffs/bola/energy(src)

/obj/item/storage/box/thunderdome/laser_eyes/populate_contents()
new /obj/item/clothing/glasses/sunglasses/lasers(src)

/obj/item/storage/box/thunderdome/maga/populate_contents()
new /obj/item/clothing/gloves/color/black/krav_maga/sec(src)
new /obj/item/reagent_containers/hypospray/ertm/perfluorodecalin(src)

/**
* Oh god.
*/
/obj/item/storage/box/thunderdome/gbs/populate_contents()
new /obj/item/reagent_containers/glass/bottle/gbs(src)

/obj/item/storage/box/thunderdome/singulatiry/populate_contents()
new /obj/item/twohanded/singularityhammer(src)
new /obj/item/implanter/adrenalin(src)
17 changes: 13 additions & 4 deletions code/modules/thunderdome/thunderdome_battle.dm
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ GLOBAL_VAR_INIT(tdome_arena_melee, locate(/area/tdome/newtdome/CQC))
/obj/item/twohanded/mjollnir = 1,
/obj/item/twohanded/chainsaw = 1,
/obj/item/twohanded/dualsaber = 1,
/obj/item/twohanded/singularityhammer = 1,
/obj/item/twohanded/fireaxe = 1,
/obj/item/melee/icepick = 1,
/obj/item/melee/candy_sword = 1,
Expand All @@ -75,9 +74,14 @@ GLOBAL_VAR_INIT(tdome_arena_melee, locate(/area/tdome/newtdome/CQC))
/obj/item/storage/box/syndie_kit/mantisblade = 1,
/obj/item/CQC_manual = 1,
/obj/item/sleeping_carp_scroll = 1,
/obj/item/clothing/gloves/color/black/krav_maga/sec = 1,
/obj/item/clothing/gloves/fingerless/rapid = 1,
/obj/item/storage/box/syndie_kit/mr_chang_technique = 1
/obj/item/storage/box/thunderdome/mr_chang_technique = 1,
/obj/item/storage/box/thunderdome/mr_chang_technique/spicy = 1,
/obj/item/storage/box/thunderdome/spears = 1,
/obj/item/storage/box/thunderdome/maga = 1,
/obj/item/storage/box/thunderdome/gbs = 1,
/obj/item/storage/box/thunderdome/singulatiry = 1,
/obj/item/implanter/adrenalin = 1
)

var/list/ranged_pool = list(
Expand All @@ -101,7 +105,12 @@ GLOBAL_VAR_INIT(tdome_arena_melee, locate(/area/tdome/newtdome/CQC))
/obj/item/gun/projectile/automatic/pistol/m1911 = 1,
/obj/item/gun/projectile/revolver/golden = 1,
/obj/item/gun/projectile/revolver/nagant = 1,
/obj/item/gun/energy/gun/nuclear = 2
/obj/item/gun/energy/gun/nuclear = 2,
/obj/item/storage/box/thunderdome/bombarda = 1,
/obj/item/storage/box/thunderdome/crossbow = 1,
/obj/item/storage/box/thunderdome/crossbow/energy = 1,
/obj/item/storage/box/thunderdome/laser_eyes = 1,
/obj/item/implanter/adrenalin = 1
)

/**
Expand Down
1 change: 1 addition & 0 deletions paradise.dme
Original file line number Diff line number Diff line change
Expand Up @@ -2841,6 +2841,7 @@
#include "code\modules\thunderdome\thunderdome_battle.dm"
#include "code\modules\thunderdome\components\death_timer_reset.dm"
#include "code\modules\thunderdome\components\thunderdome_death_signaler.dm"
#include "code\modules\thunderdome\items\special_kits.dm"
#include "code\modules\tooltip\tooltip.dm"
#include "code\modules\unit_tests\_unit_tests.dm"
#include "code\modules\vehicle\ambulance.dm"
Expand Down

0 comments on commit 7c8b6fa

Please sign in to comment.