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

Add at least a hundred carps to the white whale holy grail syndikit (#16783)

Browse Source 
* Add a hundred fucking carps

Also a carp calling system to start a carp migration (3 times).
This is going to be the server killer syndikit I feel with all those carps but OH WELL TOO BAD IF THEIR SERVER WAS UNFIT FOR CARP'SIE'S GREATNESS!

* Make the trident fit on the belt

* Make the magspear quiver fit in pocket

It's also no longer a backpack

* Update uplink_kits.dm

* Update uplink_kits.dm

* Update uplink_kits.dm

* Update uplink_kits.dm

* Update whiteship_2.dmm

Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>
This commit is contained in:
00ze-cyclone
2022-12-02 15:20:02 +01:00
committed by GitHub
parent 711adc768d
commit 846c7f8253
4 changed files with 50 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
_maps/shuttles/whiteship_2.dmm
View File

@@ -337,7 +337,7 @@
"rw" = (
/obj/structure/closet/emcloset,
/obj/effect/decal/cleanable/dirt/dust,
/obj/item/storage/backpack/magspear_quiver,
/obj/item/storage/magspear_quiver,
/obj/item/throwing_star/magspear,
/obj/item/throwing_star/magspear,
/obj/item/throwing_star/magspear,

7
code/game/objects/items/pneumaticCannon.dm
View File

@@ -328,13 +328,14 @@
. = ..()
allowed_typecache = magspear_typecache
/obj/item/storage/backpack/magspear_quiver
/obj/item/storage/magspear_quiver
name = "quiver"
desc = "A quiver for holding magspears."
slot_flags = ITEM_SLOT_POCKET
icon_state = "quiver"
item_state = "quiver"
/obj/item/storage/backpack/magspear_quiver/ComponentInitialize()
/obj/item/storage/magspear_quiver/ComponentInitialize()
. = ..()
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
STR.max_items = 20
@@ -344,6 +345,6 @@
/obj/item/throwing_star/magspear
))
/obj/item/storage/backpack/magspear_quiver/PopulateContents()
/obj/item/storage/magspear_quiver/PopulateContents()
for(var/i in 1 to 20)
new /obj/item/throwing_star/magspear(src)

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

@@ -1,3 +1,4 @@
#define CARP_CARP_CARP 1
/obj/item/storage/box/syndicate
name = "suspicious box"
@@ -137,7 +138,7 @@
new /obj/item/card/emag(src) //6 TC
/obj/item/storage/box/syndicate/bundle_B/PopulateContents()
switch (pickweight(list("v" = 2, "oddjob" = 2, "neo" = 1, "ninja" = 1, "darklord" = 1, "white_whale_holy_grail" = 2, "mad_scientist" = 2, "bee" = 2, "mr_freeze" = 2, "gang_boss" = 1)))
switch (pickweight(list("v" = 2, "oddjob" = 2, "neo" = 1, "ninja" = 1, "darklord" = 1, "white_whale_holy_grail" = CARP_CARP_CARP, "mad_scientist" = 2, "bee" = 2, "mr_freeze" = 2, "gang_boss" = 1)))
if("v") //Big Boss. Total of ~26 TC.
new /obj/item/clothing/under/syndicate/camo(src) //Reskinned tactical turtleneck, free
new /obj/item/clothing/glasses/eyepatch/bigboss(src) //Gives flash protection and night vision, probably around 2-3 TC
@@ -183,13 +184,19 @@
new /obj/item/book/granter/spell/forcewall(src) //It has the word force in it? But more importantly, it doesn't require robes and it's 1 SP and it's VERY good defense
new /obj/item/book/granter/spell/summonitem(src) //So you can throw your lightsaber and call it back. A 1 SP cost spell that doesn't require robes
if("white_whale_holy_grail") //Unique items that don't appear anywhere else
if("white_whale_holy_grail") //Unique items that don't appear anywhere else, more than 100 carps or your TC back
new /obj/item/pneumatic_cannon/speargun(src)
new /obj/item/storage/backpack/magspear_quiver(src)
new /obj/item/clothing/suit/space/hardsuit/carp(src)
new /obj/item/clothing/mask/gas/carp(src)
new /obj/item/grenade/spawnergrenade/spesscarp(src)
new /obj/item/storage/magspear_quiver(src)
new /obj/item/clothing/suit/space/hardsuit/carp(src) //1 carp
new /obj/item/clothing/mask/gas/carp(src) //1 carp?
new /obj/item/twohanded/pitchfork/trident(src)
new /obj/item/grenade/clusterbuster/spawner_spesscarp(src) //when you need A LOT of carps, you'll get at least (but most likely more) 30 carps with that
new /obj/item/grenade/spawnergrenade/spesscarp(src) //for precise and quick delivery of carps, 5 carps per grenade for a total of 20 carps
new /obj/item/grenade/spawnergrenade/spesscarp(src)
new /obj/item/grenade/spawnergrenade/spesscarp(src)
new /obj/item/grenade/spawnergrenade/spesscarp(src)
new /obj/item/carpcaller(src) //to spawn carps in space, making the place safer for you and dangerous for everyone else, you should get at least 20 carps per use so 60 carps
new /obj/item/toy/plush/carpplushie/dehy_carp //1 carp but guaranteed complete loyalty and cuddliness
if("mad_scientist")
new /obj/item/clothing/suit/toggle/labcoat/mad(src) // 0 tc
@@ -261,6 +268,8 @@
new /obj/item/reagent_containers/glass/bottle/drugs(src)
new /obj/item/slimecross/stabilized/green(src) //secret identity
#undef CARP_CARP_CARP
/obj/item/stand_arrow/boss
desc = "An arrow that can unleash <span class='holoparasite'>massive potential</span> from those stabbed by it. It has been laced with syndicate mindslave nanites that will be linked to whoever first uses it in their hand."
kill_chance = 0
@@ -287,6 +296,35 @@
qdel(M)
. = ..() //sure ok you stole the arrow
/obj/item/carpcaller
name = "Carp signal"
desc = "Emit a carp'sian bluespace wave disturbing carpspace that will pull space carps from all over the galaxy to the surrounding area of the station."
icon = 'icons/obj/assemblies.dmi'
icon_state = "bigred"
item_state = "electronic"
lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
w_class = WEIGHT_CLASS_TINY
var/remaining_uses = 3
/obj/item/carpcaller/attack_self(mob/user)
var/datum/round_event_control/carp_migration/newCarpControl = new /datum/round_event_control/carp_migration() //code taken from the portal storm ritual
var/datum/round_event/carp_migration/newCarpStorm = newCarpControl.runEvent()
newCarpStorm.setup()
remaining_uses -= 1
to_chat(user, "You call a school of space carps to the station")
if(remaining_uses <= 0) {
to_chat(user, span_warning("The [src] disappear to carpspace."))
qdel(src)
} else {
to_chat(user, span_warning("The [src] has [remaining_uses] use[remaining_uses > 1 ? "s" : ""] left."))
}
/obj/item/carpcaller/examine(mob/user)
. = ..()
if(remaining_uses != -1)
. += "It has [remaining_uses] use[remaining_uses > 1 ? "s" : ""] left."
/obj/item/storage/box/syndicate/contract_kit
real_name = "Contract Kit"
desc = "Supplied to Syndicate contractors."

1
code/game/objects/items/twohanded.dm
View File

@@ -740,6 +740,7 @@
icon_state = "trident"
name = "trident"
desc = "A trident recovered from the ruins of atlantis"
slot_flags = ITEM_SLOT_BELT
force = 14
throwforce = 23
force_wielded = 6