Skip to content

Commit

Permalink
Merge branch 'Bubberstation:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
MosleyTheMalO authored Jul 22, 2024
2 parents da36e9a + 645eb70 commit 7a2984a
Show file tree
Hide file tree
Showing 29 changed files with 2,357 additions and 13 deletions.
4 changes: 4 additions & 0 deletions html/changelogs/AutoChangeLog-pr-1819.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
author: "DimWhat for spriting, SigmaPredator for helping me with organizing this, and my (theselfish) poor keyboard."
delete-after: True
changes:
- rscadd: "Nearly every job has a Bunny outfit. I am not joking. Check your vendors."
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
/datum/uplink_item/bundles_tc/bunny
name = "Syndicate Bunny Kit"
desc = "Straight from the dens of Carota. The Tactical Rabbit Ensemble. \
Made for Tactical Rabbit Action, it's been adapted for use by the Syndicate, your welcome. \
This kit contains one armor-lined rabbit costume, white combat gloves and one single carrot shiv. (Carrot shiv may be eaten in transit.)"
item = /obj/item/storage/box/syndibunny
cost = 8
purchasable_from = UPLINK_NUKE_OPS

15 changes: 15 additions & 0 deletions modular_zubbers/code/modules/antagonists/uplink/uplinkitems.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
/obj/item/storage/box/syndibunny
name = "Syndicate bunny assassin outfit"
desc = "A box containing a high tech specialized syndicate... bunny suit?"
icon_state = "syndiebox"

/obj/item/storage/box/syndibunny/PopulateContents()
generate_items_inside(list(
/obj/item/clothing/head/playbunnyears/syndicate = 1,
/obj/item/clothing/under/syndicate/syndibunny = 1,
/obj/item/clothing/suit/jacket/tailcoat/syndicate = 1,
/obj/item/clothing/neck/tie/bunnytie/syndicate = 1,
/obj/item/clothing/shoes/fancy_heels/syndi = 1,
/obj/item/clothing/gloves/combat/white = 1,
), src)

6 changes: 6 additions & 0 deletions modular_zubbers/code/modules/clothing/gloves/syndicate.dm
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,9 @@
name = "tactical maid sleeves"
desc = "'Tactical' cleaning gloves."
icon_state = "syndimaid_arms"

/obj/item/clothing/gloves/combat/white
icon_state = "white"
greyscale_colors = "#FFFFFF"
icon = 'icons/obj/clothing/gloves.dmi'
worn_icon = 'icons/mob/clothing/hands.dmi'
Loading

0 comments on commit 7a2984a

Please sign in to comment.