Every donator request. Finally. (#1537)
## About The Pull Request This PR is meant to add toys, clothes, markings and more cosmetics requested by donators of Bubberstation. This was a task I assigned myself to take on for a long while. I decided to push this out in a PR to track progress. Artists: Crumpaloo, Casey/Keil, Wolf751, bitsynapse. <details> <summary>Full list of additions</summary> <br> -Blovy's plush, bottle, and suit. ✓ <br> -Farren's markings, hair, tail, wings, more. ✧ (semi-complete. but mostly good to go.) <br> -Astroturf's plush. ✓ <br> -exfil's wings. ✓ <br> -patriot210's clothing set ✓ <br> -detrender's in-hand item ✓ <br> -ironknight060's clothing set and item. ✓ <br> -Gavla's birthday plush ✓ <br> -Big deer hand sprites ✓ <br> -Andrew Mower's plush ✓ <br> -Ringing bell collars (needs more modularization) ✓ <br> <br> <br>ignore the commits from May 1, 2024. I am bad at github. </details> ## Why It's Good For The Game Supporters of the server should receive in-game things as thanks. ## Proof Of Testing Every commit is tested on my local beforehand before it is pushed. https://github.com/Bubberstation/Bubberstation/assets/96078776/833dbf4b-b63b-4205-8299-65ec7f170e81 https://github.com/Bubberstation/Bubberstation/assets/96078776/48ba3d2d-24ff-4535-b7d4-4b4f644627f2 https://github.com/Bubberstation/Bubberstation/assets/96078776/2b4ba30c-d7f4-4b6c-92d2-dcf5df7c78b2  ## Changelog 🆑 Shayoki, Crumpaloo, Keila, Wolf751, bitsynapse. add: Donator toys and clothes have arrived. --------- Co-authored-by: Otome <darkwolfinsanity@gmail.com> Co-authored-by: projectkepler-RU <99981766+projectkepler-ru@users.noreply.github.com> Co-authored-by: Waterpig <49160555+Majkl-J@users.noreply.github.com> Co-authored-by: Bubberbot <151680451+Bubberbot@users.noreply.github.com> Co-authored-by: lessthanthree <83487515+lessthnthree@users.noreply.github.com> Co-authored-by: Swiftfeather <jackwars4@gmail.com> Co-authored-by: Cursor <102828457+theselfish@users.noreply.github.com>
@@ -26577,7 +26577,7 @@
|
||||
/turf/open/floor/iron,
|
||||
/area/station/hallway/primary/aft)
|
||||
"caI" = (
|
||||
/obj/item/toy/plush/bigdeer_plush,
|
||||
/obj/item/toy/plush/bigdeer,
|
||||
/turf/open/floor/plating,
|
||||
/area/space/nearstation)
|
||||
"caK" = (
|
||||
|
||||
@@ -269,6 +269,7 @@
|
||||
|
||||
///from [/mob/living/carbon/human/Move]: ()
|
||||
#define COMSIG_SHOES_STEP_ACTION "shoes_step_action"
|
||||
#define COMSIG_NECK_STEP_ACTION "neck_step_action" //Bubbers addition
|
||||
|
||||
// /obj/item/implant signals
|
||||
///from base of /obj/item/implant/proc/activate(): ()
|
||||
|
||||
@@ -43,6 +43,8 @@
|
||||
RegisterSignal(parent, COMSIG_ITEM_DROPPED, PROC_REF(on_drop))
|
||||
if(istype(parent, /obj/item/clothing/shoes))
|
||||
RegisterSignal(parent, COMSIG_SHOES_STEP_ACTION, PROC_REF(step_squeak))
|
||||
if(istype(parent, /obj/item/clothing/neck))
|
||||
RegisterSignal(parent, COMSIG_NECK_STEP_ACTION, PROC_REF(step_squeak)) //Bubbers addition
|
||||
else if(isstructure(parent))
|
||||
RegisterSignal(parent, COMSIG_ATOM_ATTACK_HAND, PROC_REF(use_squeak))
|
||||
|
||||
|
||||
@@ -74,6 +74,7 @@
|
||||
/obj/item/seeds/rainbow_bunch,
|
||||
/obj/item/seeds/seedling,
|
||||
/obj/item/seeds/shrub,
|
||||
/obj/item/seeds/vaporsac, //Bubbers Addition
|
||||
/obj/item/seeds/random = 2,
|
||||
)
|
||||
crate_name = "exotic seeds crate"
|
||||
|
||||
@@ -28,6 +28,8 @@
|
||||
. = ..()
|
||||
if(shoes && body_position == STANDING_UP && loc == NewLoc && has_gravity(loc))
|
||||
SEND_SIGNAL(shoes, COMSIG_SHOES_STEP_ACTION)
|
||||
if(wear_neck && body_position == STANDING_UP && loc == NewLoc && has_gravity(loc))
|
||||
SEND_SIGNAL(wear_neck, COMSIG_NECK_STEP_ACTION) //Bubbers addition: Bell collars ring. (#1537) todo: modularize this
|
||||
|
||||
/mob/living/carbon/human/Process_Spacemove(movement_dir = 0, continuous_move = FALSE)
|
||||
if(movement_type & FLYING || HAS_TRAIT(src, TRAIT_FREE_FLOAT_MOVEMENT))
|
||||
|
||||
4
html/changelogs/AutoChangeLog-pr-1169.yml
Normal file
@@ -0,0 +1,4 @@
|
||||
author: "IgiariValkyr"
|
||||
delete-after: True
|
||||
changes:
|
||||
- rscadd: "Parts from a discontinued synth chassis line from the Mariinsky Ballet Company is making rounds on the black market - now available to install for synths and chromed up organics!"
|
||||
@@ -1489,7 +1489,7 @@ digi
|
||||
name = "Wargame Hologram Projector"
|
||||
icon_file = 'modular_skyrat/modules/wargame_projectors/icons/projectors_and_holograms.dmi'
|
||||
json_config = 'modular_skyrat/modules/GAGS/json_configs/wargame_holoprojector/projector.json'
|
||||
|
||||
|
||||
/datum/greyscale_config/hypokit
|
||||
name = "Hypospray Kit"
|
||||
icon_file = 'modular_skyrat/modules/hyposprays/icons/hypokits.dmi'
|
||||
|
||||
@@ -0,0 +1,16 @@
|
||||
{
|
||||
"ringbell": [
|
||||
{
|
||||
"type": "icon_state",
|
||||
"icon_state": "collar_obj",
|
||||
"blend_mode": "overlay",
|
||||
"color_ids": [ 1 ]
|
||||
},
|
||||
{
|
||||
"type": "icon_state",
|
||||
"icon_state": "ringbell_tag_obj",
|
||||
"blend_mode": "overlay",
|
||||
"color_ids": [ 2 ]
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
{
|
||||
"ringbell": [
|
||||
{
|
||||
"type": "icon_state",
|
||||
"icon_state": "ringbell_mob",
|
||||
"blend_mode": "overlay",
|
||||
"color_ids": [ 1 ]
|
||||
},
|
||||
{
|
||||
"type": "icon_state",
|
||||
"icon_state": "ringbell_tag_mob",
|
||||
"blend_mode": "overlay",
|
||||
"color_ids": [ 2 ]
|
||||
}
|
||||
]
|
||||
}
|
||||
9
modular_zubbers/code/game/Items/coins.dm
Normal file
@@ -0,0 +1,9 @@
|
||||
/obj/item/coin/challenge
|
||||
name = "SAC Challenge Coin"
|
||||
desc = "A challenge coin. On the front appears a shield with an armored glove holding an olive branch and three Lightning bolts. Under the shield is the banner with the words 'Strategic Air Command' written onto it. On the back is the United States Air Force Roundel with the words of 'Peace is Our Profession' written around it."
|
||||
icon = 'modular_zubbers/icons/obj/coins.dmi'
|
||||
icon_state = "coin_Stategic Air Command"
|
||||
sideslist = list("Stategic Air Command", "Peace is Our Profession")
|
||||
heads_name = "Stategic Air Command"
|
||||
material_flags = NONE
|
||||
override_material_worth = TRUE
|
||||
@@ -35,13 +35,16 @@
|
||||
squeak_override = list('sound/machines/beep.ogg' = 1)
|
||||
gender = FEMALE
|
||||
|
||||
/obj/item/toy/plush/bigdeer_plush
|
||||
/obj/item/toy/plush/bigdeer
|
||||
name = "big deer plushie"
|
||||
desc = "An incredibly round deer plush. It appears to have had too many berries for snack time."
|
||||
icon = 'modular_zubbers/icons/obj/toys/plushes.dmi'
|
||||
icon_state = "bigdeer" //sprited by Gavla
|
||||
attack_verb_simple = list("puff", "smother")
|
||||
squeak_override = list('modular_zubbers/sound/misc/squeakle.ogg' = 1)
|
||||
lefthand_file = 'modular_zubbers/icons/mob/inhands/items/plushes_lefthand.dmi'
|
||||
righthand_file = 'modular_zubbers/icons/mob/inhands/items/plushes_righthand.dmi'
|
||||
inhand_icon_state = "bigdeer"
|
||||
|
||||
/obj/item/toy/plush/bubbledragon
|
||||
name = "bubbledragon plushie"
|
||||
@@ -100,3 +103,43 @@
|
||||
/obj/item/toy/plush/skyrat/jecca
|
||||
lefthand_file = 'modular_zubbers/icons/mob/inhands/items/plushes_lefthand.dmi'
|
||||
righthand_file = 'modular_zubbers/icons/mob/inhands/items/plushes_righthand.dmi'
|
||||
|
||||
/obj/item/toy/plush/purplecat
|
||||
name = "Purple cat plushie"
|
||||
desc = "A small, fluffy purple cat with an even purpler collar and bell. It also has a translucent green tail that rubbery to the touch."
|
||||
icon = 'modular_zubbers/icons/obj/toys/plushes.dmi'
|
||||
icon_state = "purplecat" //sprited by Bit_Synergy
|
||||
attack_verb_simple = list("mew", "mow")
|
||||
attack_verb_continuous = list("mews", "mows")
|
||||
squeak_override = list('modular_zubbers/sound/misc/moew.ogg' = 1)
|
||||
gender = FEMALE
|
||||
|
||||
/obj/item/toy/plush/largeredslime
|
||||
name = "large red slime plushie" //Donator item exclusive for Blovy. Sprited by Casey/Keila.
|
||||
desc = "The plushie is squishy to touch and smells strongly of strawberry."
|
||||
icon = 'modular_zubbers/icons/obj/toys/plushes.dmi'
|
||||
icon_state = "blovyplushie"
|
||||
attack_verb_continuous = list("blorbles", "slimes", "absorbs")
|
||||
attack_verb_simple = list("blorble", "slime", "absorb")
|
||||
squeak_override = list('sound/effects/blobattack.ogg' = 1)
|
||||
|
||||
/obj/item/toy/plush/tunafish
|
||||
name = "Piscene Paddle" //Donator plush for Astroturf, sprited by Crumpaloo
|
||||
desc = "Useful for more than just sashimi."
|
||||
icon = 'modular_zubbers/icons/obj/toys/plushes.dmi'
|
||||
icon_state = "tunafish"
|
||||
attack_verb_continuous = list("slaps", "whacks")
|
||||
attack_verb_simple = list("slap", "whack")
|
||||
squeak_override = list('sound/weapons/slap.ogg' = 1)
|
||||
lefthand_file = 'modular_zubbers/icons/mob/inhands/items/plushes_lefthand.dmi'
|
||||
righthand_file = 'modular_zubbers/icons/mob/inhands/items/plushes_righthand.dmi'
|
||||
inhand_icon_state = "tunafish"
|
||||
|
||||
/obj/item/toy/plush/secoff
|
||||
name = "GalFed Secoff"
|
||||
desc = "A soft toy representing a popular, young officer, representing the alliance between GalFed and NT. The bottom of his work boot says 'Andy'"
|
||||
icon = 'modular_zubbers/icons/obj/toys/plushes.dmi'
|
||||
icon_state = "secoff"
|
||||
attack_verb_continuous = list("shoots (and misses)", "batongs", "annoys", "harmbatons", "magdumps")
|
||||
attack_verb_simple = list("shot (and missed)", "batong", "annoy", "harmbaton", "magdump")
|
||||
squeak_override = list('sound/weapons/gun/general/bolt_rack.ogg' = 1)
|
||||
|
||||
13
modular_zubbers/code/modules/GAGS/greyscale_configs.dm
Normal file
@@ -0,0 +1,13 @@
|
||||
// Ringing Bell
|
||||
// All json_config files are located on modular_skyrat/modules/GAGS/json_configs/
|
||||
// Reason: See code/datums/greyscale/_greyscale_config.dm lines 63-69.
|
||||
|
||||
/datum/greyscale_config/collar/ringbell
|
||||
name = "Ring Bell Collar"
|
||||
icon_file = 'modular_zubbers/code/modules/GAGS/icons/collar.dmi'
|
||||
json_config = 'modular_skyrat/modules/GAGS/json_configs/collar/ringbell.json'
|
||||
|
||||
/datum/greyscale_config/collar/ringbell/worn
|
||||
name = "Ring Bell Collar (Worn)"
|
||||
json_config = 'modular_skyrat/modules/GAGS/json_configs/collar/ringbell_worn.json'
|
||||
|
||||
BIN
modular_zubbers/code/modules/GAGS/icons/collar.dmi
Normal file
|
After Width: | Height: | Size: 929 B |
7
modular_zubbers/code/modules/clothing/gloves/misc.dm
Normal file
@@ -0,0 +1,7 @@
|
||||
/obj/item/clothing/gloves/misc/diver //Donor item for patriot210
|
||||
icon = 'modular_zubbers/icons/obj/clothing/gloves.dmi'
|
||||
worn_icon = 'modular_zubbers/icons/mob/clothing/hands.dmi'
|
||||
name = "black divers gloves"
|
||||
desc = "An old pair of gloves used by a now-defunct mining coalition."
|
||||
icon_state = "diver"
|
||||
worn_icon_state = "diver"
|
||||
11
modular_zubbers/code/modules/clothing/neck/collars.dm
Normal file
@@ -0,0 +1,11 @@
|
||||
/obj/item/clothing/neck/human_petcollar/locked/ringbell
|
||||
name = "ringing bell collar"
|
||||
desc = "A soft collar that chimes for your little pet!"
|
||||
icon_state = "ringbell"
|
||||
greyscale_config = /datum/greyscale_config/collar/ringbell
|
||||
greyscale_config_worn = /datum/greyscale_config/collar/ringbell/worn
|
||||
greyscale_colors = "#FF4F66#FFCC00"
|
||||
|
||||
/obj/item/clothing/neck/human_petcollar/locked/ringbell/Initialize(mapload)
|
||||
. = ..()
|
||||
AddComponent(/datum/component/squeak, list('modular_zubbers/sound/misc/collarbell1.ogg'=1,'modular_zubbers/sound/misc/collarbell2.ogg'=1), 50, 100, 5)
|
||||
7
modular_zubbers/code/modules/clothing/shoes/boots.dm
Normal file
@@ -0,0 +1,7 @@
|
||||
/obj/item/clothing/shoes/boots/diver //Donor item for patriot210
|
||||
icon = 'modular_zubbers/icons/obj/clothing/shoes.dmi'
|
||||
worn_icon = 'modular_zubbers/icons/mob/clothing/feet.dmi'
|
||||
name = "black divers boots"
|
||||
desc = "An old pair of boots used by a now-defunct mining coalition, it seems close to the ones used by Nanotrasen miners, but without the compartments for fitting small items."
|
||||
icon_state = "diver"
|
||||
worn_icon_state = "diver"
|
||||
@@ -36,3 +36,21 @@
|
||||
name = "ronin jacket"
|
||||
desc = "A dark leather jacket with the logo of an old Sol Chromerock band on it."
|
||||
icon_state = "ronin"
|
||||
|
||||
/obj/item/clothing/suit/jacket/diver //Donor item for patriot210
|
||||
name = "black divers coat"
|
||||
desc = "A dark leather jacket with the logo of an old Sol Chromerock band on it."
|
||||
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
|
||||
icon_state = "diver"
|
||||
worn_icon_state = "diver"
|
||||
icon = 'modular_zubbers/icons/obj/clothing/jacket.dmi'
|
||||
worn_icon = 'modular_zubbers/icons/mob/clothing/suits/jacket.dmi'
|
||||
|
||||
/obj/item/clothing/suit/jacket/flight //Donor item for ironknight060
|
||||
name = "MA-1 flight jacket"
|
||||
desc = "Originally developed for the United States Air Force. This jacket has been lovingly passed down from airman to airman before arriving in the 26th Century. Its complete with the reversible orange interior for emergency situations as well. From what you can see on the tag, this Jacket appears to have been made in the year 1985 for the USAF, with a faint name written onto the nametag."
|
||||
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
|
||||
icon_state = "flight"
|
||||
worn_icon_state = "flight"
|
||||
icon = 'modular_zubbers/icons/obj/clothing/jacket.dmi'
|
||||
worn_icon = 'modular_zubbers/icons/mob/clothing/suits/jacket.dmi'
|
||||
|
||||
10
modular_zubbers/code/modules/clothing/suits/misc.dm
Normal file
@@ -0,0 +1,10 @@
|
||||
/obj/item/clothing/suit/misc/holographic //Donator item for Blovy. Sprited by Casey/Keila.
|
||||
icon = 'modular_zubbers/icons/obj/clothing/suits/misc.dmi'
|
||||
icon_state = "holographic"
|
||||
worn_icon = 'modular_zubbers/icons/mob/clothing/suits/misc.dmi' //Works like a gear harness but keeps private parts hidden for the suit slot.
|
||||
worn_icon_state = "holographic"
|
||||
name = "Holographic Suit V4000"
|
||||
desc = "The Holographic Suit V4000 has multiple layers designed specifically to refract and bend light waves around the user, effectively making them transparent to the naked eye. The suit comes equipped with advanced sensors that constantly scan its surroundings, adjusting its holographic projection accordingly. As soon as you put on the suit it calibrates itself based on your unique body shape and size."
|
||||
attachment_slot_override = CHEST
|
||||
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
|
||||
body_parts_covered = CHEST|GROIN
|
||||
8
modular_zubbers/code/modules/clothing/under/misc.dm
Normal file
@@ -0,0 +1,8 @@
|
||||
/obj/item/clothing/under/misc/diver //Donor item for patriot210
|
||||
name = "black divers uniform"
|
||||
desc = "An old exploration uniform used by a now-defunct mining coalition, even after all this time, it still fits."
|
||||
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
|
||||
icon_state = "diver"
|
||||
worn_icon_state = "diver"
|
||||
icon = 'modular_zubbers/icons/obj/clothing/suits.dmi'
|
||||
worn_icon = 'modular_zubbers/icons/mob/clothing/suits.dmi'
|
||||
@@ -28,3 +28,11 @@
|
||||
dimension_x = 32
|
||||
dimension_y = 32
|
||||
color_src = USE_MATRIXED_COLORS
|
||||
|
||||
/datum/sprite_accessory/wings/mammal/techarm
|
||||
name = "Tech Arm"
|
||||
icon = 'modular_zubbers/icons/mob/sprite_accesory/wings.dmi'
|
||||
icon_state = "techarm"
|
||||
dimension_x = 32
|
||||
dimension_y = 32
|
||||
color_src = USE_MATRIXED_COLORS
|
||||
|
||||
@@ -13,3 +13,7 @@
|
||||
item_path = /obj/item/clothing/gloves/tactical_maid
|
||||
donator_only = TRUE
|
||||
|
||||
/datum/loadout_item/gloves/diver //Donor item for patriot210
|
||||
name = "Black Divers Gloves"
|
||||
item_path = /obj/item/clothing/gloves/misc/diver
|
||||
ckeywhitelist = list("sexmaster, ironknight060")
|
||||
|
||||
@@ -18,3 +18,17 @@
|
||||
|
||||
/datum/loadout_item/inhand/flag_solfed
|
||||
name = "Folded Solarian State Flag"
|
||||
|
||||
/datum/loadout_item/inhand/ornate_bottle //Donator item exclusive for Blovy. Sprited by Casey/Keila.
|
||||
name = "Ornate Bottle"
|
||||
item_path = /obj/item/reagent_containers/cup/glass/bottle/ornate
|
||||
ckeywhitelist = list("blovy")
|
||||
|
||||
/datum/loadout_item/inhand/challengecoin
|
||||
name = "SAC Challenge Coin"
|
||||
item_path = /obj/item/coin/challenge
|
||||
|
||||
/datum/loadout_item/inhand/vaporsac //donator request for MyGuy49
|
||||
name = "Vaporsac Seeds"
|
||||
item_path = /obj/item/seeds/vaporsac
|
||||
ckeywhitelist = list("MyGuy49")
|
||||
|
||||
@@ -2,3 +2,7 @@
|
||||
name = "Heart Collar"
|
||||
item_path = /obj/item/clothing/neck/lace_collar
|
||||
donator_only = TRUE
|
||||
|
||||
/datum/loadout_item/neck/ringbell
|
||||
name = "Ringing Bell Collar"
|
||||
item_path = /obj/item/clothing/neck/human_petcollar/locked/ringbell
|
||||
|
||||
@@ -15,3 +15,8 @@
|
||||
/datum/loadout_item/shoes/latex_heels
|
||||
name = "latex heels"
|
||||
item_path = /obj/item/clothing/shoes/latex_heels
|
||||
|
||||
/datum/loadout_item/shoes/diver //Donor item for patriot210
|
||||
name = "Black Divers Boots"
|
||||
item_path = /obj/item/clothing/shoes/boots/diver
|
||||
ckeywhitelist = list("sexmaster, ironknight060")
|
||||
|
||||
@@ -40,3 +40,12 @@
|
||||
name = "ronin jacket"
|
||||
item_path = /obj/item/clothing/suit/jacket/trucker/ronin
|
||||
donator_only = TRUE //Donator item for arandomhyena
|
||||
|
||||
/datum/loadout_item/suit/flight //Donor item for ironknight060
|
||||
name = "MA-1 flight jacket"
|
||||
item_path = /obj/item/clothing/suit/jacket/flight //Donor item for ironknight060
|
||||
|
||||
/datum/loadout_item/suit/diver //Donor item for patriot210
|
||||
name = "Black Divers Coat"
|
||||
item_path = /obj/item/clothing/suit/jacket/diver
|
||||
ckeywhitelist = list("sexmaster, ironknight060")
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
/datum/loadout_item/toys/bigdeer_plush
|
||||
name = "big deer plushie"
|
||||
item_path = /obj/item/toy/plush/bigdeer_plush //Donor item for Gavla
|
||||
item_path = /obj/item/toy/plush/bigdeer //Donor item for Gavla
|
||||
|
||||
/datum/loadout_item/toys/nobl_plush
|
||||
name = "fluffy skog plushie"
|
||||
@@ -47,4 +47,21 @@
|
||||
/datum/loadout_item/toys/carrotbag
|
||||
name = "Carrot Bag"
|
||||
item_path = /obj/item/sbeacondrop/carrot
|
||||
ckeywhitelist = list("slippyjoe")
|
||||
//ckeywhitelist = list("slippyjoe")
|
||||
|
||||
/datum/loadout_item/toys/largeredslime
|
||||
name = "Large Red Slime Plush"
|
||||
item_path = /obj/item/toy/plush/largeredslime
|
||||
ckeywhitelist = list("blovy")
|
||||
|
||||
/datum/loadout_item/toys/tunafish
|
||||
name = "Tuna Fish Plush"
|
||||
item_path = /obj/item/toy/plush/tunafish
|
||||
|
||||
/datum/loadout_item/toys/purplecat
|
||||
name = "Purple Cat Plush"
|
||||
item_path = /obj/item/toy/plush/purplecat
|
||||
|
||||
/datum/loadout_item/toys/secoff
|
||||
name = "GalFed Secoff Plush"
|
||||
item_path = /obj/item/toy/plush/secoff
|
||||
|
||||
@@ -28,3 +28,8 @@
|
||||
name = "Tactical Maid Costume"
|
||||
item_path = /obj/item/clothing/under/misc/maid/tactical
|
||||
donator_only = TRUE
|
||||
|
||||
/datum/loadout_item/under/miscellaneous/diver
|
||||
name = "Black Divers Uniform"
|
||||
item_path = /obj/item/clothing/under/misc/diver
|
||||
ckeywhitelist = list("sexmaster, ironknight060")
|
||||
|
||||
@@ -91,3 +91,29 @@
|
||||
icon_state = "weight2"
|
||||
default_color = DEFAULT_PRIMARY
|
||||
affected_bodyparts = CHEST
|
||||
|
||||
/datum/body_marking/bubber/bellybutton //a literal pixel addition
|
||||
icon_state = "bellybutton"
|
||||
name = "Belly Button"
|
||||
default_color = DEFAULT_PRIMARY
|
||||
affected_bodyparts = CHEST
|
||||
gendered = FALSE
|
||||
|
||||
/datum/body_marking/bubber/bellymonster
|
||||
icon_state = "bellymonster"
|
||||
name = "Belly Monster"
|
||||
default_color = "#CCCCCC"
|
||||
affected_bodyparts = CHEST
|
||||
gendered = FALSE
|
||||
|
||||
/datum/body_marking/bubber/bellymonster_alt
|
||||
icon_state = "bellymonster_alt"
|
||||
name = "Belly Monster (Alt)"
|
||||
default_color = "#CCCCCC"
|
||||
affected_bodyparts = CHEST
|
||||
gendered = FALSE
|
||||
|
||||
/* /datum/body_marking/bubber/talons //still no digitigrade feet fix
|
||||
icon_state = "talon"
|
||||
affected_bodyparts = LEG_LEFT | LEG_RIGHT
|
||||
*/
|
||||
|
||||
@@ -5,3 +5,13 @@
|
||||
icon_state = "wine"
|
||||
volume = 30
|
||||
list_reagents = list(/datum/reagent/consumable/ethanol/wine = 30)
|
||||
|
||||
/obj/item/reagent_containers/cup/glass/bottle/ornate //Donator item exclusive for Blovy. Sprited by Casey/Keila.
|
||||
name = "ornate bottle"
|
||||
desc = "A very large bottle with very ornate decorations on the sides. It is easy to hold, with the top having a moon shaped cork."
|
||||
icon = 'modular_zubbers/icons/obj/drinks/bottles.dmi'
|
||||
icon_state = "ornate"
|
||||
volume = 100
|
||||
fill_icon = 'modular_zubbers/icons/obj/medical/reagent_fillings.dmi'
|
||||
fill_icon_state = "ornate"
|
||||
fill_icon_thresholds = list(0, 10, 20, 30, 40, 50, 60, 70, 80, 90)
|
||||
|
||||
BIN
modular_zubbers/icons/customization/fluff.dmi
Normal file
|
After Width: | Height: | Size: 340 B |
BIN
modular_zubbers/icons/customization/hair.dmi
Normal file
|
After Width: | Height: | Size: 404 B |
|
Before Width: | Height: | Size: 3.1 KiB After Width: | Height: | Size: 3.7 KiB |
BIN
modular_zubbers/icons/mob/clothing/feet.dmi
Normal file
|
After Width: | Height: | Size: 360 B |
BIN
modular_zubbers/icons/mob/clothing/hands.dmi
Normal file
|
After Width: | Height: | Size: 322 B |
|
Before Width: | Height: | Size: 659 B After Width: | Height: | Size: 2.8 KiB |
|
Before Width: | Height: | Size: 7.2 KiB After Width: | Height: | Size: 9.6 KiB |
BIN
modular_zubbers/icons/mob/clothing/suits/misc.dmi
Normal file
|
After Width: | Height: | Size: 224 B |
|
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 2.8 KiB |
|
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 2.8 KiB |
|
Before Width: | Height: | Size: 4.0 KiB After Width: | Height: | Size: 2.4 KiB |
|
Before Width: | Height: | Size: 608 B After Width: | Height: | Size: 578 B |
|
Before Width: | Height: | Size: 4.2 KiB After Width: | Height: | Size: 5.2 KiB |
BIN
modular_zubbers/icons/obj/clothing/shoes.dmi
Normal file
|
After Width: | Height: | Size: 377 B |
|
Before Width: | Height: | Size: 411 B After Width: | Height: | Size: 622 B |
BIN
modular_zubbers/icons/obj/clothing/suits/misc.dmi
Normal file
|
After Width: | Height: | Size: 323 B |
BIN
modular_zubbers/icons/obj/coins.dmi
Normal file
|
After Width: | Height: | Size: 659 B |
|
Before Width: | Height: | Size: 705 B After Width: | Height: | Size: 1.3 KiB |
BIN
modular_zubbers/icons/obj/medical/reagent_fillings.dmi
Normal file
|
After Width: | Height: | Size: 689 B |
|
Before Width: | Height: | Size: 40 KiB After Width: | Height: | Size: 43 KiB |
@@ -0,0 +1,5 @@
|
||||
/datum/sprite_accessory/fluff/moth/owl
|
||||
icon = 'modular_zubbers/icons/customization/fluff.dmi'
|
||||
name = "Owl fluff"
|
||||
icon_state = "owl"
|
||||
default_color = DEFAULT_TERTIARY
|
||||
@@ -0,0 +1,4 @@
|
||||
/datum/sprite_accessory/hair/skyrat/flaguardyain
|
||||
icon = 'modular_zubbers/icons/customization/hair.dmi'
|
||||
name = "Flaguardyain"
|
||||
icon_state = "hair_flaguardyain"
|
||||
BIN
modular_zubbers/sound/misc/collarbell1.ogg
Normal file
BIN
modular_zubbers/sound/misc/collarbell2.ogg
Normal file
BIN
modular_zubbers/sound/misc/moew.ogg
Normal file
@@ -8434,6 +8434,7 @@
|
||||
#include "modular_zubbers\code\game\gamemodes\dynamic\dynamic_rulesets_roundstart.dm"
|
||||
#include "modular_zubbers\code\game\gamemodes\objectives\gimmick.dm"
|
||||
#include "modular_zubbers\code\game\gamemodes\objectives\overrides.dm"
|
||||
#include "modular_zubbers\code\game\Items\coins.dm"
|
||||
#include "modular_zubbers\code\game\Items\nerdcrowbar.dm"
|
||||
#include "modular_zubbers\code\game\Items\plushes.dm"
|
||||
#include "modular_zubbers\code\game\Items\storage\backpack.dm"
|
||||
@@ -8590,20 +8591,25 @@
|
||||
#include "modular_zubbers\code\modules\client\verbs\character_directory.dm"
|
||||
#include "modular_zubbers\code\modules\clothing\undershirt.dm"
|
||||
#include "modular_zubbers\code\modules\clothing\glasses\nerd.dm"
|
||||
#include "modular_zubbers\code\modules\clothing\gloves\misc.dm"
|
||||
#include "modular_zubbers\code\modules\clothing\gloves\syndicate.dm"
|
||||
#include "modular_zubbers\code\modules\clothing\gloves\bracers\armwraps.dm"
|
||||
#include "modular_zubbers\code\modules\clothing\head\helmet.dm"
|
||||
#include "modular_zubbers\code\modules\clothing\head\jobs.dm"
|
||||
#include "modular_zubbers\code\modules\clothing\head\syndicate.dm"
|
||||
#include "modular_zubbers\code\modules\clothing\head\wig.dm"
|
||||
#include "modular_zubbers\code\modules\clothing\neck\collars.dm"
|
||||
#include "modular_zubbers\code\modules\clothing\outfits\lace.dm"
|
||||
#include "modular_zubbers\code\modules\clothing\outfits\outlast.dm"
|
||||
#include "modular_zubbers\code\modules\clothing\outfits\plasmaman.dm"
|
||||
#include "modular_zubbers\code\modules\clothing\outfits\prison_headset.dm"
|
||||
#include "modular_zubbers\code\modules\clothing\shoes\boots.dm"
|
||||
#include "modular_zubbers\code\modules\clothing\suits\armor.dm"
|
||||
#include "modular_zubbers\code\modules\clothing\suits\jacket.dm"
|
||||
#include "modular_zubbers\code\modules\clothing\suits\misc.dm"
|
||||
#include "modular_zubbers\code\modules\clothing\suits\nerd.dm"
|
||||
#include "modular_zubbers\code\modules\clothing\under\_under.dm"
|
||||
#include "modular_zubbers\code\modules\clothing\under\misc.dm"
|
||||
#include "modular_zubbers\code\modules\clothing\under\syndicate.dm"
|
||||
#include "modular_zubbers\code\modules\clothing\under\jobs\command.dm"
|
||||
#include "modular_zubbers\code\modules\clothing_reskins\redsec.dm"
|
||||
@@ -8645,6 +8651,7 @@
|
||||
#include "modular_zubbers\code\modules\fluff\flora\ash_flora.dm"
|
||||
#include "modular_zubbers\code\modules\food_and_drinks\machinery\stove.dm"
|
||||
#include "modular_zubbers\code\modules\food_and_drinks\recipes\tablecraft\recipes_seafood.dm"
|
||||
#include "modular_zubbers\code\modules\GAGS\greyscale_configs.dm"
|
||||
#include "modular_zubbers\code\modules\ghostcafe\hilbertshotel_silicon.dm"
|
||||
#include "modular_zubbers\code\modules\height_scaling\icons.dm"
|
||||
#include "modular_zubbers\code\modules\height_scaling\preferences.dm"
|
||||
@@ -8847,6 +8854,8 @@
|
||||
#include "modular_zubbers\modules\customization\modules\language\piratespeak.dm"
|
||||
#include "modular_zubbers\modules\customization\modules\language\siikmaas.dm"
|
||||
#include "modular_zubbers\modules\customization\modules\mob\dead\taur_types.dm"
|
||||
#include "modular_zubbers\modules\customization\modules\mob\dead\new_player\sprite_accessories\fluff.dm"
|
||||
#include "modular_zubbers\modules\customization\modules\mob\dead\new_player\sprite_accessories\hair.dm"
|
||||
#include "modular_zubbers\modules\customization\modules\mob\dead\new_player\sprite_accessories\horns.dm"
|
||||
#include "modular_zubbers\modules\customization\modules\mob\dead\new_player\sprite_accessories\ipc.dm"
|
||||
#include "modular_zubbers\modules\customization\modules\mob\dead\new_player\sprite_accessories\skrell_hair.dm"
|
||||
|
||||