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

Merge branch 'master' of https://github.com/tgstation/tgstation into pupstream-2025-09-07

Browse Source 
# Conflicts:
#	README.md
#	code/__DEFINES/admin.dm
#	code/__DEFINES/melee.dm
#	code/_globalvars/traits/_traits.dm
#	code/controllers/subsystem/economy.dm
#	code/datums/components/crafting/crafting.dm
#	code/datums/elements/crusher_loot.dm
#	code/modules/antagonists/pirate/pirate_shuttle_equipment.dm
#	code/modules/clothing/suits/_suits.dm
#	code/modules/escape_menu/leave_body.dm
#	code/modules/jobs/job_types/_job.dm
#	code/modules/mining/equipment/mineral_scanner.dm
#	code/modules/mob/living/living.dm
#	code/modules/plumbing/plumbers/pill_press.dm
#	tgui/packages/tgui/interfaces/Vending.tsx
This commit is contained in:
nevimer
2025-09-07 00:37:52 -04:00
parent f5bbea9cc9 f4360e2da5
commit b348b617a3
362 changed files with 82084 additions and 106117 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/uplink/uplink_items/spy_unique.dm
+37
View File
@@ -155,3 +155,40 @@
item = /obj/item/melee/baton/nunchaku
cost = SPY_UPPER_COST_THRESHOLD
uplink_item_flags = SYNDIE_ILLEGAL_TECH | SYNDIE_TRIPS_CONTRABAND
/datum/uplink_item/spy_unique/penbang
name = "Penbang"
desc = "A flashbang disguised as a normal pen - click and throw! Has no other warning upon being activated. \
Fuse duration depends on how far the cap is twisted."
item = /obj/item/pen/penbang
cost = 1
/datum/uplink_item/spy_unique/cameraflash
name = "Camera Flash"
desc = "A camera with a high-powered flash. Can be used as a normal flash when in close proximity to a target."
item = /obj/item/camera/flash
cost = 1
/datum/uplink_item/spy_unique/daggerboot
name = "Boot Dagger"
desc = "A pair of boots with a dagger embedded into the sole. Kicks with these will stab the target, potentially causing bleeding."
item = /obj/item/clothing/shoes/jackboots/dagger
cost = 1
/datum/uplink_item/spy_unique/monster_cube_box
name = "Random Monster Cubes"
desc = "A box containing a bunch of random monster cubes. Add water and see what you get!"
item = /obj/item/storage/box/monkeycubes/random
cost = SPY_LOWER_COST_THRESHOLD // There's some really bad stuff in here but also some really mild stuff
/datum/uplink_item/spy_unique/sleeping_carp
name = "Sleeping Carp Technique"
desc = "A scroll teaching you the basics of the Sleeping Carp martial art."
item = /datum/uplink_item/stealthy_weapons/martialarts::item
cost = /datum/uplink_item/stealthy_weapons/martialarts::cost
/datum/uplink_item/spy_unique/spider_bite
name = "Spider Bite Technique"
desc = "A scroll teaching you the basics of the Spider Bite martial art."
item = /obj/item/book/granter/martial/spider_bite
cost = SPY_UPPER_COST_THRESHOLD // While SCarp is firmly in the upper threshold, Spider Bite can be in either middle or upper.
code/modules/uplink/uplink_items/stealthy.dm
+1 -1
View File
@@ -88,7 +88,7 @@
population_minimum = TRAITOR_POPULATION_LOWPOP
cost = 17
surplus = 0
purchasable_from = ~UPLINK_ALL_SYNDIE_OPS
purchasable_from = ~(UPLINK_ALL_SYNDIE_OPS|UPLINK_SPY)
/datum/uplink_item/stealthy_weapons/crossbow
name = "Miniature Energy Crossbow"