diff --git a/GainStation13/code/game/donator.dm b/GainStation13/code/game/donator.dm new file mode 100644 index 0000000000..c3d8e11da3 --- /dev/null +++ b/GainStation13/code/game/donator.dm @@ -0,0 +1,108 @@ +//sorry for defining this here, just thought it'd be more convenient +/obj/item/clothing/suit/chloe/halsey //sorry to whoever chloe is, but that coat is far too badass not to be used + name = "Halsey's Commander Overcoat" + desc = "A Ginormous red overcoat that looks fit for a commander. Has a tag on it that reads: 'Property of Halsey Harmonten. Please return if lost!'" + armor = list("melee" = 20, "bullet" = 20, "laser" = 0,"energy" = 20, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 20, "acid" = 0) //worn by a captain player, might as well recompensate not wearing the carapace + +/datum/gear/rose_plush + name = "Dezir Rose Plush" + category = LOADOUT_SUBCATEGORY_BACKPACK_TOYS + path = /obj/item/toy/plush/gs13/rose + ckeywhitelist = list("eremitanovem", "sonoida") + +/datum/gear/chloe_plush + name = "Chloe Plush" + category = LOADOUT_SUBCATEGORY_BACKPACK_TOYS + path = /obj/item/toy/plush/gs13/chloe + ckeywhitelist = list("alphas0") + +/datum/gear/grimmy_coat + name = "Overcoat of the Destitute" + category = LOADOUT_SUBCATEGORY_BACKPACK_TOYS + path = /obj/item/clothing/suit/storage/blueshield/grimmy + ckeywhitelist = list("bbgrimmy") + +/obj/item/clothing/suit/storage/blueshield/grimmy + name = "Overcoat of the Destitute" + desc = "Welcome all to the everlasting all-time low. Please put your hands together for the ever-failing one man show: Domino!" + +/datum/gear/tarek_gps + name = "Tarek's GPS" + category = LOADOUT_SUBCATEGORY_BACKPACK_TOYS + path = /obj/item/gps/mining + ckeywhitelist = list("e926user25") + +/datum/gear/milwaukee_crowbar + name = "Milwaukee Pocket Crowbar" + category = LOADOUT_SUBCATEGORY_BACKPACK_TOYS + path = /obj/item/crowbar/bronze/glaug + ckeywhitelist = list("happytpr") + +/obj/item/crowbar/bronze/glaug + name = "Milwaukee Pocket Crowbar" + desc = "Much more expensive. Still serves the same function." + +/datum/gear/fatfang + name = "Fattening Fangs Injector" + category = LOADOUT_SUBCATEGORY_BACKPACK_TOYS + path = /obj/item/dnainjector/fatfang + ckeywhitelist = list("sonoida") + +/datum/gear/toolbelt + name = "Empty Toolbelt" + category = LOADOUT_SUBCATEGORY_BACKPACK_TOYS + path = /obj/item/storage/belt/utility + ckeywhitelist = list("killmewitha22", "Killmewitha22", "KILLMEWITHA22", "sonoida") + +/obj/item/toy/sword/chloesabre/halsey + name = "Halsey's Sabre" + desc = "An elegant weapon, similar in design to the Captain's Sabre, but with a platinum hilt and an adamantine blade. the hilt has an engraved hyena on it." + force = 16 + +/obj/item/gun/ballistic/revolver/mateba/moka + name = "\improper Custom Unica 6 revolver" + desc = "An elegant and ornate revolver belonging to a certain hellcat commander. There are some words carved on its side: 'Dura Lex, Sed Lex'" + +//metha rossi you fat hog + +/datum/gear/wgspell_add + name = "Weight Gain Spellbook" + category = LOADOUT_SUBCATEGORY_BACKPACK_TOYS + path = /obj/item/book/granter/spell/fattening + ckeywhitelist = list("sonoida", "themrsky", "Not Number") + +/datum/gear/wgspell_transfer + name = "Weight Transfer Spellbook" + category = LOADOUT_SUBCATEGORY_BACKPACK_TOYS + path = /obj/item/book/granter/spell/fattening/transfer + ckeywhitelist = list("sonoida", "themrsky", "Not Number") + +/datum/gear/wgspell_take + name = "Weight Steal Spellbook" + category = LOADOUT_SUBCATEGORY_BACKPACK_TOYS + path = /obj/item/book/granter/spell/fattening/steal + ckeywhitelist = list("sonoida", "themrsky", "Not Number") + + +/datum/gear/white_eyepatch_cabal + name = "Cabal's Eyepatch" + category = LOADOUT_CATEGORY_GLASSES + path = /obj/item/clothing/glasses/eyepatch/cabal + ckeywhitelist = list("spess_lizurd", "SPESS LIZURD", "spess lizurd", "SPESS_LIZURD", "spesslizurd", "sonoida") + +/datum/gear/white_eyepatch + name = "White Eyepatch" + category = LOADOUT_CATEGORY_GLASSES + path = /obj/item/clothing/glasses/eyepatch/white + +/obj/item/clothing/glasses/eyepatch/white + name = "White eyepatch" + desc = "Smells faintly of medicine and headaches." + icon_state = "eyepatch_white" + item_state = "eyepatch_white" + +/obj/item/clothing/glasses/eyepatch/cabal + name = "Cabal's Eyepatch" + desc = "Vulpine sluts only." + icon_state = "eyepatch_white" + item_state = "eyepatch_white" diff --git a/GainStation13/code/game/plushes.dm b/GainStation13/code/game/plushes.dm new file mode 100644 index 0000000000..1fb8e73715 --- /dev/null +++ b/GainStation13/code/game/plushes.dm @@ -0,0 +1,68 @@ +/obj/item/toy/plush/gs13 + icon = 'icons/obj/plushes.dmi' + +/obj/item/toy/plush/gs13/metha + name = "Magical Captain plush/gs13ie" + desc = "A NEW GATO TOY FROM GATO CORPORATION, FEEL THE MAGIC OF THIS COOL TOY!" + icon_state = "metha" + attack_verb = list("fattened","Metha'd", "Brigged") + gender = FEMALE + +/obj/item/toy/plush/gs13/amogus + name = "Amingas Prushie" + desc = "Yoo it mogngas sunsies. hehee" + icon_state = "yongas" + attack_verb = list("Sussied") + gender = MALE + +/obj/item/toy/plush/gs13/catgirl/fi + desc = "An adorable stuffed toy that resembles a very enthusiastic catgirl. Its smug aura mocks you." + icon_state = "fi" + attack_verb = list("pranked","nyuh'd","science'd","hugged") + + +/obj/item/toy/plush/gs13/tertia + desc = "An adorable stuffed toy that resembles a mischevious yet helpful slime-goat. It seems to have a mysterious smirk." + icon_state = "tertia" + attack_verb = list("glorped","hugged","experimented","baaaah'd") + squeak_override = list('sound/effects/blobattack.ogg' = 1) + +/obj/item/toy/plush/gs13/primus + desc = "An adorable stuffed toy that resembles a mad scientist goat. Its hair seems to be quite messy." + icon_state = "primus" + attack_verb = list("glorped","hugged","experimented","baaaah'd") + squeak_override = list('sound/effects/blobattack.ogg' = 1) + +/obj/item/toy/plush/gs13/melony + desc = "A plump looking deer with a red circle on her belly. She seems to have a tired but a welcoming gaze." + icon_state = "melony" + attack_verb = list("bleated", "wobbled", "Melony'd") + +/obj/item/toy/plush/gs13/rose + desc = "An energetic looking snake toy with a silly little rose hanging from the side of his head." + icon_state = "rose" + attack_verb = list("hissed", "nibbled", "squished") + squeak_override = list('modular_citadel/sound/voice/weh.ogg' = 1) + +/obj/item/toy/plush/gs13/kinichi + desc = "A silly looking plush/gs13ie of an adorable lizard janitor. His smile is heartwarming to look at." + icon_state = "kinichi" + attack_verb = list("hissed","squished", "hugged") + +/obj/item/toy/plush/gs13/lgo + desc = "An attempt to market one of cleaning machines from the local market, in the form of a purchasable plush/gs13ie." + icon_state = "lgo" + attack_verb = list("gronkled","beeped", "brushed") + +/obj/item/toy/plush/gs13/oliver + desc = "A plush/gs13 of a silly shark with a stylish bandanna." + icon_state = "oliver" + attack_verb = list("chomped", "bit") + +/obj/item/toy/plush/gs13/chloe + desc = "A plush/gs13 of a chunky red-haired botanist." + icon_state = "chloe" + attack_verb = list("squished", "hugged", "smushed") + +/obj/item/toy/plush/gs13/mammal/fox + icon_state = "fox" diff --git a/GainStation13/code/machinery/gym.dm b/GainStation13/code/machinery/gym.dm new file mode 100644 index 0000000000..2834d3444d --- /dev/null +++ b/GainStation13/code/machinery/gym.dm @@ -0,0 +1,5 @@ +/obj/structure/punching_bag + var/loss_per_punch = 5 // GS13 + +/obj/structure/weightmachine + var/loss_per_use = 30 diff --git a/GainStation13/icons/obj/plushes.dmi b/GainStation13/icons/obj/plushes.dmi new file mode 100644 index 0000000000..82d46c8de7 Binary files /dev/null and b/GainStation13/icons/obj/plushes.dmi differ diff --git a/code/_globalvars/lists/maintenance_loot.dm b/code/_globalvars/lists/maintenance_loot.dm index d02ebb659e..562224bc2c 100644 --- a/code/_globalvars/lists/maintenance_loot.dm +++ b/code/_globalvars/lists/maintenance_loot.dm @@ -116,6 +116,11 @@ GLOBAL_LIST_INIT(maintenance_loot, list( /obj/item/storage/box/marshmallow = 2, /obj/item/clothing/gloves/tackler/offbrand = 1, /obj/item/stack/sticky_tape = 1, + //GS13 EDIT + /obj/item/trash/fatoray_scrap1 = 1, + /obj/item/trash/fatoray_scrap2 = 1, + /obj/item/trash/odd_disk = 1, + // GS13 EDIT END "" = 3 )) diff --git a/code/modules/mining/lavaland/ruins/gym.dm b/code/modules/mining/lavaland/ruins/gym.dm index 68e0706d84..82c643546a 100644 --- a/code/modules/mining/lavaland/ruins/gym.dm +++ b/code/modules/mining/lavaland/ruins/gym.dm @@ -64,6 +64,11 @@ to_chat(user, finishmessage) user.apply_status_effect(STATUS_EFFECT_EXERCISED) + //GS13 + var/mob/living/carbon/lifter = user + if(lifter) + lifter.adjust_fatness(-loss_per_use, FATTENING_TYPE_WEIGHT_LOSS) + /obj/structure/weightmachine/stacklifter name = "chest press machine" icon_state = "stacklifter" diff --git a/code/modules/vending/clothesmate.dm b/code/modules/vending/clothesmate.dm index 3e889328a4..283ee5ad95 100644 --- a/code/modules/vending/clothesmate.dm +++ b/code/modules/vending/clothesmate.dm @@ -7,6 +7,10 @@ vend_reply = "Thank you for using the ClothesMate!" products = list(/obj/item/clothing/head/that = 4, /obj/item/clothing/head/fedora = 3, + //GS13 EDIT START + /obj/item/clothing/suit/jacket/letterman_gato = 5, + /obj/item/clothing/under/color/grey/modular = 6, + //GS13 EDIT END /obj/item/clothing/head/beret = 3, /obj/item/clothing/head/beret/black = 3, /obj/item/clothing/head/beret/purple = 3, diff --git a/tgstation.dme b/tgstation.dme index 9c62457f8c..f0227ac0b6 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3914,7 +3914,9 @@ #include "GainStation13\code\datums\mutations\fatfang.dm" #include "GainStation13\code\datums\mutations\radfat.dm" #include "GainStation13\code\datums\status_effects\fatstun.dm" +#include "GainStation13\code\game\donator.dm" #include "GainStation13\code\game\lore_papers.dm" +#include "GainStation13\code\game\plushes.dm" #include "GainStation13\code\game\sound.dm" #include "GainStation13\code\game\area\ruins.dm" #include "GainStation13\code\game\objects\effects\spawners\choco_slime_delivery.dm" @@ -3927,6 +3929,7 @@ #include "GainStation13\code\machinery\adipoelectric_transformer.dm" #include "GainStation13\code\machinery\fattening_turret.dm" #include "GainStation13\code\machinery\feeding_tube.dm" +#include "GainStation13\code\machinery\gym.dm" #include "GainStation13\code\machinery\supply_teleporter.dm" #include "GainStation13\code\mechanics\calorite.dm" #include "GainStation13\code\mechanics\fatness.dm"