mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-23 05:00:55 +01:00
[MIRROR] Adds a collar bomb to the black market. (#26907)
* Adds a collar bomb to the black market. (#81898) ## About The Pull Request Originally part of the other blackmarket PR, but it seemed a tad awkward to have it mandatorily installed on mobs rescued from the holding facility. But yeah, this PR adds a neck item that causes the wearer's death with a 5 seconds countdown when triggered, which can be bought from the market uplinks. The box comes with a yellow button to trigger it, but it can also hold a signaler (which the wearer cannot tamper) if you wish to use assemblies. Take note that, upon being worn, the item cannot be removed by any mean beside beheading iirc (so HARS should counter it), and fire/acid if you have a ton of patience because of its high armor values. ## Why It's Good For The Game More mean and evilish stuff to populate the black market with. ## Changelog 🆑 add: Added a collar bomb to the black market. add: Added a possible kit to the special syndie bundle B, which also has uses these collars. /🆑 --------- Co-authored-by: san7890 <the@ san7890.com> * Adds a collar bomb to the black market. --------- Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com> Co-authored-by: san7890 <the@ san7890.com>
This commit is contained in:
co-authored by
san7890
Ghom
parent
5c805a7f68
commit
b7f4873e1c
@@ -211,3 +211,11 @@
|
||||
new /obj/item/clothing/gloves/combat/floortile(src)
|
||||
new /obj/item/clothing/shoes/jackboots/floortile(src)
|
||||
new /obj/item/storage/backpack/floortile(src)
|
||||
|
||||
/obj/item/storage/box/collar_bomb
|
||||
name = "collar bomb box"
|
||||
desc = "A small print on the back reads 'For research purposes only. Handle with care. In case of emergency, call the following number:'... the rest is scratched out with a marker..."
|
||||
|
||||
/obj/item/storage/box/collar_bomb/PopulateContents()
|
||||
var/obj/item/collar_bomb_button/button = new(src)
|
||||
new /obj/item/clothing/neck/collar_bomb(src, button)
|
||||
|
||||
@@ -20,6 +20,7 @@
|
||||
#define KIT_BEES "bee"
|
||||
#define KIT_MR_FREEZE "mr_freeze"
|
||||
#define KIT_TRAITOR_2006 "ancient"
|
||||
#define KIT_DEAD_MONEY "dead_money"
|
||||
#define KIT_SAM_FISHER "sam_fisher"
|
||||
#define KIT_PROP_HUNT "prop_hunt"
|
||||
|
||||
@@ -190,6 +191,7 @@
|
||||
KIT_MAD_SCIENTIST = 2,
|
||||
KIT_BEES = 1,
|
||||
KIT_MR_FREEZE = 2,
|
||||
KIT_DEAD_MONEY = 2,
|
||||
KIT_TRAITOR_2006 = 1,
|
||||
KIT_SAM_FISHER = 1,
|
||||
KIT_PROP_HUNT = 1
|
||||
@@ -282,6 +284,17 @@
|
||||
if(KIT_TRAITOR_2006) //A kit so old, it's probably older than you. //This bundle is filled with the entire uplink contents traitors had access to in 2006, from OpenSS13. Notably the esword was not a choice but existed in code.
|
||||
new /obj/item/storage/toolbox/emergency/old/ancientbundle(src) //Items fit neatly into a classic toolbox just to remind you what the theme is.
|
||||
|
||||
if(KIT_DEAD_MONEY)
|
||||
for(var/i in 1 to 4)
|
||||
new /obj/item/clothing/neck/collar_bomb(src) // These let you remotely kill people with a signaler, though you have to get them first.
|
||||
new /obj/item/storage/box/syndie_kit/signaler(src)
|
||||
new /obj/item/mod/control/pre_equipped/responsory/inquisitory/syndie(src) // basically a snowflake yet better elite modsuit, so like, 8 + 5 tc.
|
||||
new /obj/item/card/id/advanced/chameleon(src) // 2 tc
|
||||
new /obj/item/clothing/mask/chameleon(src)
|
||||
new /obj/item/melee/baton/telescopic/contractor_baton(src) // 7 tc
|
||||
new /obj/item/jammer(src) // 5 tc
|
||||
new /obj/item/pinpointer/crew(src) //priceless
|
||||
|
||||
if(KIT_SAM_FISHER)
|
||||
new /obj/item/clothing/under/syndicate/combat(src)
|
||||
new /obj/item/clothing/suit/armor/vest/marine/pmc(src) //The armor kit is comparable to the infiltrator, 6 TC
|
||||
@@ -864,5 +877,6 @@
|
||||
#undef KIT_BEES
|
||||
#undef KIT_MR_FREEZE
|
||||
#undef KIT_TRAITOR_2006
|
||||
#undef KIT_DEAD_MONEY
|
||||
#undef KIT_SAM_FISHER
|
||||
#undef KIT_PROP_HUNT
|
||||
|
||||
Reference in New Issue
Block a user