cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adds lots of New Items to Syndicate Kits

Browse Source
This commit is contained in:
yogstation13-bot
2019-06-19 04:20:52 +01:00
parent 3012dc37cd
commit c32d6c8f44
5 changed files with 57 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/game/objects/items/melee/energy.dm
View File

@@ -192,6 +192,16 @@
else
return ..()
/obj/item/melee/transforming/energy/sword/bee //yeah its fucking stupid but I wanted a yellow esword which is weaker than what we have
name = "Bee Sword"
desc = "Channel the might of the bees with this powerful sword"
force = 0
throwforce = 0
force_on = 22
throwforce_on = 16
item_color = "yellow"
light_color = "#ffff00"
/obj/item/melee/transforming/energy/sword/pirate
name = "energy cutlass"
desc = "Arrrr matey."

55
code/game/objects/items/storage/uplink_kits.dm
View File

@@ -3,16 +3,17 @@
/obj/item/storage/box/syndicate/bundle_A/PopulateContents()
switch (pickweight(list("recon" = 2, "bloodyspai" = 3, "stealth" = 2, "screwed" = 2, "sabotage" = 3, "guns" = 2, "murder" = 2, "implant" = 1, "hacker" = 3, "sniper" = 1, "metaops" = 1)))
if("recon") // 26 tc
if("recon")
new /obj/item/clothing/glasses/thermal/xray(src) // ~8 tc?
new /obj/item/storage/briefcase/launchpad(src) //6 tc
new /obj/item/twohanded/binoculars(src) // 2 tc?
new /obj/item/encryptionkey/syndicate(src) // 2 tc
new /obj/item/storage/box/syndie_kit/space(src) //4 tc
new /obj/item/grenade/syndieminibomb/concussion/frag(src) // ~2 tc each?
new /obj/item/grenade/syndieminibomb/concussion/frag(src)
new /obj/item/grenade/syndieminibomb/concussion/frag(src)
new /obj/item/flashlight/emp(src)
if("bloodyspai") // 27 tc now this is more right
if("bloodyspai")
new /obj/item/clothing/under/chameleon(src) // 2 tc since it's not the full set
new /obj/item/clothing/mask/chameleon(src) // Goes with above
new /obj/item/card/id/syndicate(src) // 2 tc
@@ -26,15 +27,17 @@
new /obj/item/flashlight/emp(src) // 2 tc
new /obj/item/chameleon(src) // 7 tc
if("stealth") // 31 tc
if("stealth")
new /obj/item/gun/energy/kinetic_accelerator/crossbow(src)
new /obj/item/pen/sleepy(src)
new /obj/item/healthanalyzer/rad_laser(src)
new /obj/item/chameleon(src)
new /obj/item/soap/syndie(src)
new /obj/item/clothing/glasses/thermal/syndi(src)
new /obj/item/flashlight/emp(src)
new /obj/item/jammer(src)
if("guns") // 28 tc now
if("guns")
new /obj/item/gun/ballistic/revolver(src)
new /obj/item/ammo_box/a357(src)
new /obj/item/ammo_box/a357(src)
@@ -44,7 +47,7 @@
new /obj/item/clothing/mask/gas/clown_hat(src)
new /obj/item/clothing/under/suit_jacket/really_black(src)
if("screwed") // 29 tc
if("screwed")
new /obj/item/sbeacondrop/bomb(src)
new /obj/item/grenade/syndieminibomb(src)
new /obj/item/sbeacondrop/powersink(src)
@@ -52,7 +55,7 @@
new /obj/item/clothing/head/helmet/space/syndicate/black/red(src)
new /obj/item/encryptionkey/syndicate(src)
if("murder") // 28 tc now
if("murder")
new /obj/item/melee/transforming/energy/sword/saber(src)
new /obj/item/clothing/glasses/thermal/syndi(src)
new /obj/item/card/emag(src)
@@ -60,7 +63,7 @@
new /obj/item/encryptionkey/syndicate(src)
new /obj/item/grenade/syndieminibomb(src)
if("implant") // 55+ tc holy shit what the fuck this is a lottery disguised as fun boxes isn't it?
if("implant")
new /obj/item/implanter/freedom(src)
new /obj/item/implanter/uplink/precharged(src)
new /obj/item/implanter/emp(src)
@@ -68,20 +71,25 @@
new /obj/item/implanter/explosive(src)
new /obj/item/implanter/storage(src)
if("hacker") // 26 tc
if("hacker")
new /obj/item/aiModule/syndicate(src)
new /obj/item/card/emag(src)
new /obj/item/encryptionkey/binary(src)
new /obj/item/aiModule/toyAI(src)
new /obj/item/multitool/ai_detect(src)
new /obj/item/storage/toolbox/syndicate(src)
new /obj/item/camera_bug(src)
new /obj/item/clothing/glasses/thermal/syndi(src)
new /obj/item/card/id/syndicate(src)
if("lordsingulo") // 24 tc
if("lordsingulo")
new /obj/item/sbeacondrop(src)
new /obj/item/clothing/suit/space/syndicate/black/red(src)
new /obj/item/clothing/head/helmet/space/syndicate/black/red(src)
new /obj/item/card/emag(src)
new /obj/item/storage/toolbox/syndicate(src)
if("sabotage") // 26 tc now
if("sabotage")
new /obj/item/grenade/plastic/c4 (src)
new /obj/item/grenade/plastic/c4 (src)
new /obj/item/doorCharge(src)
@@ -91,6 +99,7 @@
new /obj/item/cartridge/virus/syndicate(src)
new /obj/item/storage/toolbox/syndicate(src) //To actually get to those places
new /obj/item/pizzabox/bomb(src)
new /obj/item/storage/box/syndie_kit/emp(src)
if("sniper") //This shit is unique so can't really balance it around tc, also no silencer because getting killed without ANY indicator on what killed you sucks
new /obj/item/gun/ballistic/automatic/sniper_rifle(src) // 12 tc
@@ -100,7 +109,7 @@
new /obj/item/clothing/mask/gas/clown_hat(src)
new /obj/item/clothing/under/suit_jacket/really_black(src)
if("metaops") // 30 tc
if("metaops")
new /obj/item/clothing/suit/space/hardsuit/syndi(src) // 8 tc
new /obj/item/gun/ballistic/shotgun/bulldog/unrestricted(src) // 8 tc
new /obj/item/implanter/explosive(src) // 2 tc
@@ -112,7 +121,7 @@
/obj/item/storage/box/syndicate/bundle_B/PopulateContents()
switch (pickweight(list( "bond" = 2, "ninja" = 1, "darklord" = 1, "white_whale_holy_grail" = 2, "mad_scientist" = 2, "bee" = 2, "mr_freeze" = 2)))
if("bond") // 29 tc
if("bond")
new /obj/item/gun/ballistic/automatic/pistol(src)
new /obj/item/suppressor(src)
new /obj/item/ammo_box/magazine/m10mm(src)
@@ -120,8 +129,9 @@
new /obj/item/clothing/under/chameleon(src)
new /obj/item/card/id/syndicate(src)
new /obj/item/reagent_containers/syringe/stimulants(src)
if("ninja") // 33 tc worth
new /obj/item/reagent_containers/glass/rag(src)
if("ninja")
new /obj/item/katana(src) // Unique , hard to tell how much tc this is worth. 8 tc?
new /obj/item/implanter/adrenalin(src) // 8 tc
for(var/i in 1 to 6)
@@ -130,7 +140,7 @@
new /obj/item/card/id/syndicate(src) // 2 tc
new /obj/item/chameleon(src) // 7 tc
if("darklord") //20 tc + tk + summon item close enough for now
if("darklord")
new /obj/item/twohanded/dualsaber(src)
new /obj/item/dnainjector/telemut/darkbundle(src)
new /obj/item/clothing/suit/hooded/chaplain_hoodie(src)
@@ -145,7 +155,7 @@
new /obj/item/clothing/mask/gas/carp(src)
new /obj/item/grenade/spawnergrenade/spesscarp(src)
if("mad_scientist") // ~26 tc
if("mad_scientist")
new /obj/item/clothing/suit/toggle/labcoat/mad(src) // 0 tc
new /obj/item/clothing/shoes/jackboots(src) // 0 tc
new /obj/item/megaphone(src) // 0 tc (because how else are they to know you're mad?)
@@ -157,15 +167,19 @@
new /obj/item/assembly/signaler(src) // 0 tc
new /obj/item/assembly/signaler(src) // 0 tc
new /obj/item/storage/toolbox/syndicate(src) // 1 tc
if("bee") // ~25 tc
new /obj/item/pen/edagger(src)
new /obj/item/gun/energy/wormhole_projector(src) //mooorttyyyy
new /obj/item/gun/energy/decloner/unrestricted(src)
if("bee")
new /obj/item/paper/fluff/bee_objectives(src) // 0 tc (motivation)
new /obj/item/clothing/suit/hooded/bee_costume(src) // 0 tc
new /obj/item/clothing/mask/rat/bee(src) // 0 tc
new /obj/item/storage/belt/fannypack/yellow(src) // 0 tc
new /obj/item/storage/box/syndie_kit/bee_grenades(src) // 15 tc
new /obj/item/reagent_containers/glass/bottle/beesease(src) // 10 tc?
new /obj/item/melee/transforming/energy/sword/bee(src) //priceless
if("mr_freeze")
new /obj/item/clothing/glasses/cold(src)
new /obj/item/clothing/gloves/color/black(src)
@@ -179,6 +193,7 @@
new /obj/item/dnainjector/geladikinesis(src)
new /obj/item/dnainjector/cryokinesis(src)
new /obj/item/gun/energy/temperature/security(src)
new /obj/item/melee/transforming/energy/sword/saber/blue(src) //see see it fits the theme bc its blue and ice is blue
/obj/item/storage/box/syndicate/contract_kit
name = "Contract Kit"

3
code/modules/projectiles/ammunition/energy/special.dm
View File

@@ -11,6 +11,9 @@
projectile_type = /obj/item/projectile/energy/declone
select_name = "declone"
fire_sound = 'sound/weapons/pulse3.ogg'
/obj/item/ammo_casing/energy/declone/weak
projectile_type = /obj/item/projectile/energy/declone/weak
/obj/item/ammo_casing/energy/flora
fire_sound = 'sound/effects/stealthoff.ogg'

4
code/modules/projectiles/guns/energy/special.dm
View File

@@ -40,6 +40,10 @@
if(!QDELETED(cell) && (cell.charge > shot.e_cost))
add_overlay("decloner_spin")
/obj/item/gun/energy/decloner/unrestricted
pin = /obj/item/firing_pin
ammo_type = list(/obj/item/ammo_casing/energy/declone/weak)
/obj/item/gun/energy/floragun
name = "floral somatoray"
desc = "A tool that discharges controlled radiation which induces mutation in plant cells."

6
code/modules/projectiles/projectile/energy/misc.dm
View File

@@ -5,7 +5,11 @@
damage_type = CLONE
irradiate = 100
impact_effect_type = /obj/effect/temp_visual/impact_effect/green_laser
/obj/item/projectile/energy/declone/weak
damage = 9
irradiate = 30
/obj/item/projectile/energy/dart //ninja throwing dart
name = "dart"
icon_state = "toxin"