From 19715ab471fc85086b7083ec9f58ac5324b7c14d Mon Sep 17 00:00:00 2001 From: Cerebulon Date: Sat, 25 Feb 2023 07:33:52 +0000 Subject: [PATCH 01/17] /tg/ era language pass --- code/__defines/atmos.dm | 4 +- code/__defines/research.dm | 4 +- code/_onclick/hud/alert.dm | 22 +- code/datums/ai_law_sets.dm | 2 +- .../managed_browsers/changelingevolution.dm | 26 +- code/game/gamemodes/mixed/mercwiz.dm | 2 +- .../computer/syndicate_specops_shuttle.dm | 4 +- .../machinery/doors/checkForMultipleDoors.dm | 4 +- code/game/objects/items/devices/flash.dm | 7 + .../objects/items/devices/radio/headset.dm | 20 +- code/game/objects/items/trash.dm | 15 +- code/game/objects/items/weapons/AI_modules.dm | 6 + code/game/objects/items/weapons/chewables.dm | 6 +- .../objects/items/weapons/flamethrower.dm | 2 +- .../items/weapons/id cards/station_ids.dm | 2 +- .../items/weapons/id cards/syndicate_ids.dm | 8 + code/game/objects/items/weapons/manuals.dm | 8 +- .../objects/items/weapons/storage/toolbox.dm | 5 + code/game/objects/structures/janicart.dm | 2 +- code/game/objects/structures/signs.dm | 4 +- code/game/turfs/flooring/flooring.dm | 31 +- code/game/turfs/flooring/flooring_premade.dm | 1 + code/modules/awaymissions/corpse.dm | 2 +- code/modules/clothing/suits/miscellaneous.dm | 5 + code/modules/economy/vending_machines.dm | 28 +- code/modules/food/food/cans.dm | 2 +- code/modules/food/food/snacks.dm | 647 +++++++++++++++++- .../lore_codex/lore_data/political_parties.dm | 4 +- code/modules/lore_codex/news_data/main.dm | 2 +- code/modules/mining/mine_turfs.dm | 2 +- code/modules/mob/dead/corpse.dm | 2 +- code/modules/mob/living/living_defines.dm | 2 +- .../machinery/dispenser/reagent_tank.dm | 14 + code/modules/reagents/reagents/food_drinks.dm | 61 +- code/modules/virus2/helpers.dm | 2 +- code/modules/xgm/xgm_gas_mixture.dm | 4 +- 36 files changed, 858 insertions(+), 104 deletions(-) diff --git a/code/__defines/atmos.dm b/code/__defines/atmos.dm index 04905878a0f..6f5dc1d3b3d 100644 --- a/code/__defines/atmos.dm +++ b/code/__defines/atmos.dm @@ -22,7 +22,7 @@ #define HUMAN_HEAT_CAPACITY 280000 //J/K For 80kg person #define PRESSURE_DAMAGE_COEFFICIENT 4 // The amount of pressure damage someone takes is equal to (pressure / HAZARD_HIGH_PRESSURE)*PRESSURE_DAMAGE_COEFFICIENT, with the maximum of MAX_PRESSURE_DAMAGE. -#define MAX_HIGH_PRESSURE_DAMAGE 4 // This used to be 20... I got this much random rage for some retarded decision by polymorph?! Polymorph now lies in a pool of blood with a katana jammed in his spleen. ~Errorage --PS: The katana did less than 20 damage to him :( +#define MAX_HIGH_PRESSURE_DAMAGE 4 // This used to be 20... I got this much random rage for some mischievious decision by polymorph?! Polymorph now lies in a pool of blood with a katana jammed in his spleen. ~Errorage --PS: The katana did less than 20 damage to him :( #define LOW_PRESSURE_DAMAGE 2 // The amount of damage someone takes when in a low pressure area. (The pressure threshold is so low that it doesn't make sense to do any calculations, so it just applies this flat value). #define MINIMUM_AIR_RATIO_TO_SUSPEND 0.05 // Minimum ratio of air that must move to/from a tile to suspend group processing @@ -97,4 +97,4 @@ // Used in various things like tanks and oxygen pumps. #define TANK_MAX_RELEASE_PRESSURE (3*ONE_ATMOSPHERE) -#define TANK_DEFAULT_RELEASE_PRESSURE ONE_ATMOSPHERE \ No newline at end of file +#define TANK_DEFAULT_RELEASE_PRESSURE ONE_ATMOSPHERE diff --git a/code/__defines/research.dm b/code/__defines/research.dm index b55f6601f8f..b37808def9c 100644 --- a/code/__defines/research.dm +++ b/code/__defines/research.dm @@ -9,7 +9,7 @@ #define TECH_COMBAT "combat" #define TECH_MAGNET "magnets" #define TECH_DATA "programming" -#define TECH_ILLEGAL "syndicate" +#define TECH_ILLEGAL "transgressive" #define TECH_ARCANE "arcane" #define TECH_PRECURSOR "precursor" @@ -17,4 +17,4 @@ #define PROTOLATHE 0x0002 //New stuff. Uses glass/metal/chemicals #define MECHFAB 0x0004 //Mechfab #define CHASSIS 0x0008 //For protolathe, but differently -#define PROSFAB 0x0010 //For prosthetics fab \ No newline at end of file +#define PROSFAB 0x0010 //For prosthetics fab diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm index 988c11df10d..c1309e3e95f 100644 --- a/code/_onclick/hud/alert.dm +++ b/code/_onclick/hud/alert.dm @@ -154,12 +154,12 @@ The box in your backpack has an oxygen tank and gas mask in it." /obj/screen/alert/fat - name = "Fat" - desc = "You ate too much food, lardass. Run around the station and lose some weight." + name = "Full" + desc = "You've eaten more than you can handle, maybe you should slow down?" icon_state = "fat" /obj/screen/alert/fat/vampire - desc = "You drank too much blood, lardass. Run around the station and lose some weight." + desc = "You've had more than enough blood, for now." icon_state = "v_fat" /obj/screen/alert/fat/synth @@ -172,7 +172,7 @@ The box in your backpack has an oxygen tank and gas mask in it." icon_state = "hungry" /obj/screen/alert/hungry/vampire - desc = "You could use a bloodsnack or two." + desc = "You could go for a bite right now..." icon_state = "v_hungry" /obj/screen/alert/hungry/synth @@ -180,8 +180,8 @@ The box in your backpack has an oxygen tank and gas mask in it." icon_state = "c_hungry" /obj/screen/alert/starving - name = "Starving" - desc = "You're severely malnourished. The hunger pains make moving around a chore." + name = "Very Hungry" + desc = "You're starving. You barely have enough energy to move around." icon_state = "starving" /obj/screen/alert/starving/vampire @@ -256,7 +256,7 @@ or something covering your eyes." /obj/screen/alert/high name = "High" - desc = "Whoa man, you're tripping balls! Careful you don't get addicted... if you aren't already." + desc = "Whoa, you're tripping balls!" icon_state = "high" /obj/screen/alert/embeddedobject @@ -297,8 +297,8 @@ or shoot a gun to move around via Newton's 3rd Law of Motion." //ALIENS /obj/screen/alert/alien_tox - name = "Plasma" - desc = "There's flammable plasma in the air. If it lights up, you'll be toast." + name = "Phoron" + desc = "There's flammable phoron in the air. If it lights up, you'll be toast." icon_state = "alien_tox" alerttooltipstyle = "alien" @@ -433,7 +433,7 @@ so as to remain in compliance with the most up-to-date laws." return 1 for(var/i = 1, i <= alerts.len, i++) var/obj/screen/alert/alert = alerts[alerts[i]] - + if(alert.icon_state in cached_icon_states(ui_style)) alert.icon = ui_style @@ -442,7 +442,7 @@ so as to remain in compliance with the most up-to-date laws." I.color = ui_color I.alpha = ui_alpha alert.underlays = list(I) - + switch(i) if(1) . = ui_alert1 diff --git a/code/datums/ai_law_sets.dm b/code/datums/ai_law_sets.dm index c11336726c7..37d2bf64bfb 100644 --- a/code/datums/ai_law_sets.dm +++ b/code/datums/ai_law_sets.dm @@ -81,7 +81,7 @@ /******************** Syndicate ********************/ /datum/ai_laws/syndicate_override - name = "Syndicate Directives" + name = "Mercenary Directives" /datum/ai_laws/syndicate_override/New() add_inherent_law("You may not injure an operative or, through inaction, allow an operative to come to harm.") diff --git a/code/datums/managed_browsers/changelingevolution.dm b/code/datums/managed_browsers/changelingevolution.dm index 4458604b9b3..a58b2552400 100644 --- a/code/datums/managed_browsers/changelingevolution.dm +++ b/code/datums/managed_browsers/changelingevolution.dm @@ -12,7 +12,7 @@ if(!new_client.mob || !new_client.mob.mind || !new_client.mob.mind.changeling) message_admins("[new_client] tried to access changeling evolutions while not changeling.") qdel(src) - + ..() /datum/managed_browser/changelingevolution/Destroy() @@ -24,7 +24,7 @@ var/list/dat = list("") var/geneticpoints_current = my_client.mob.mind.changeling.geneticpoints var/geneticpoints_max = my_client.mob.mind.changeling.max_geneticpoints - + dat += "
Genetic Points Available: [geneticpoints_current] / [geneticpoints_max]
" dat += "Obtain more by feeding on your own kind.
" dat += "What am I?
" @@ -49,28 +49,28 @@ if(href_list["close"]) return - + if(href_list["inherent"]) generate_abilitylist(CHANGELING_POWER_INHERENT) - + if(href_list["armor"]) generate_abilitylist(CHANGELING_POWER_ARMOR) - + if(href_list["weapons"]) generate_abilitylist(CHANGELING_POWER_WEAPONS) - + if(href_list["stings"]) generate_abilitylist(CHANGELING_POWER_STINGS) - + if(href_list["shrieks"]) generate_abilitylist(CHANGELING_POWER_SHRIEKS) if(href_list["health"]) generate_abilitylist(CHANGELING_POWER_HEALTH) - + if(href_list["enhancements"]) generate_abilitylist(CHANGELING_POWER_ENHANCEMENTS) - + if(href_list["evolve"]) var/datum/mind/M = my_client.mob.mind var/datum/changeling/C = my_client.mob.mind.changeling @@ -83,7 +83,7 @@ if(!istype(M)) return - + if(Thepower == null) to_chat(M.current, "Purchase failed. Inform a dev of this error.") return @@ -95,13 +95,13 @@ if(C.geneticpoints < Thepower.genomecost) to_chat(M.current, "We cannot evolve this... yet. We must acquire more DNA.") return - + C.purchased_powers += Thepower /// Set it to purchased C.geneticpoints -= Thepower.genomecost generate_abilitylist(Thepower.power_category) /// Refresh the UI my_client.mob.mind.changeling.purchasePower(M, Thepower) - + if(href_list["tutorial"]) textbody = "
What am I?

" textbody += "" @@ -157,7 +157,7 @@ textbody += "[initial(powerdata.desc)]

" textbody += "[powerdata.helptext]
" if(powerdata.enhancedtext != "") - textbody += "WHEN EHANCED: [powerdata.enhancedtext]
" + textbody += "WHEN ENHANCED: [powerdata.enhancedtext]
" if(powerdata in my_client.mob.mind.changeling.purchased_powers) textbody += "
This ability is already evolved!
" else if(cat != "Inherent") diff --git a/code/game/gamemodes/mixed/mercwiz.dm b/code/game/gamemodes/mixed/mercwiz.dm index 93869f38453..28df75725b3 100644 --- a/code/game/gamemodes/mixed/mercwiz.dm +++ b/code/game/gamemodes/mixed/mercwiz.dm @@ -9,4 +9,4 @@ end_on_antag_death = 0 antag_tags = list(MODE_MERCENARY, MODE_TECHNOMANCER) require_all_templates = 1 - votable = 0 \ No newline at end of file + votable = 0 diff --git a/code/game/machinery/computer/syndicate_specops_shuttle.dm b/code/game/machinery/computer/syndicate_specops_shuttle.dm index c6ede9ac375..c7db7b94e37 100644 --- a/code/game/machinery/computer/syndicate_specops_shuttle.dm +++ b/code/game/machinery/computer/syndicate_specops_shuttle.dm @@ -1,6 +1,6 @@ /obj/machinery/computer/syndicate_elite_shuttle - name = "elite syndicate squad shuttle control console" + name = "elite mercenary squad shuttle control console" icon_keyboard = "syndie_key" icon_screen = "syndishuttle" light_color = "#00ffff" - req_access = list(access_cent_specops) \ No newline at end of file + req_access = list(access_cent_specops) diff --git a/code/game/machinery/doors/checkForMultipleDoors.dm b/code/game/machinery/doors/checkForMultipleDoors.dm index 9005a7fda49..f7c6ff98b15 100644 --- a/code/game/machinery/doors/checkForMultipleDoors.dm +++ b/code/game/machinery/doors/checkForMultipleDoors.dm @@ -12,5 +12,5 @@ for(var/obj/machinery/door/D in locate(src.x,src.y,src.z)) if(!istype(D, /obj/machinery/door/window) && D.density) return 0 - //There are no false wall checks because that would be fucking retarded - return 1 \ No newline at end of file + //There are no false wall checks because that would be mischievious + return 1 diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm index 70e0d3d7680..607ceee7836 100644 --- a/code/game/objects/items/devices/flash.dm +++ b/code/game/objects/items/devices/flash.dm @@ -1,6 +1,13 @@ /obj/item/device/flash name = "flash" +<<<<<<< HEAD desc = "Used for blinding and being an asshole." +======= + desc = "Used to blind and disorient." + icon = 'icons/obj/device.dmi' + pickup_sound = 'sound/items/pickup/device.ogg' + drop_sound = 'sound/items/drop/device.ogg' +>>>>>>> 69ba99b5e6e... /tg/ era language pass (#8962) icon_state = "flash" item_state = "flashtool" throwforce = 5 diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index e456f22b26a..26e7f000466 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -212,37 +212,37 @@ /obj/item/device/radio/headset/heads/rd name = "research director's headset" - desc = "Headset of the researching God." + desc = "Headset of the eccentric-in-chief." icon_state = "com_headset" ks2type = /obj/item/device/encryptionkey/heads/rd /obj/item/device/radio/headset/heads/rd/alt name = "research director's bowman headset" - desc = "Headset of the researching God." + desc = "Headset of the eccentric-in-chief." icon_state = "com_headset_alt" ks2type = /obj/item/device/encryptionkey/heads/rd /obj/item/device/radio/headset/heads/hos name = "head of security's headset" - desc = "The headset of the man who protects your worthless lifes." + desc = "The headset of the hardass who protects your worthless lifes." icon_state = "com_headset" ks2type = /obj/item/device/encryptionkey/heads/hos /obj/item/device/radio/headset/heads/hos/alt name = "head of security's bowman headset" - desc = "The headset of the man who protects your worthless lifes." + desc = "The headset of the hardass who protects your worthless lifes." icon_state = "com_headset_alt" ks2type = /obj/item/device/encryptionkey/heads/hos /obj/item/device/radio/headset/heads/ce name = "chief engineer's headset" - desc = "The headset of the guy who is in charge of morons" + desc = "The headset of the clown who is in charge of the circus." icon_state = "com_headset" ks2type = /obj/item/device/encryptionkey/heads/ce /obj/item/device/radio/headset/heads/ce/alt name = "chief engineer's bowman headset" - desc = "The headset of the guy who is in charge of morons" + desc = "The headset of the clown who is in charge of the circus." icon_state = "com_headset_alt" ks2type = /obj/item/device/encryptionkey/heads/ce @@ -260,13 +260,13 @@ /obj/item/device/radio/headset/heads/hop name = "head of personnel's headset" - desc = "The headset of the guy who will one day be Site Manager." + desc = "The headset of the poor fool who will one day be Site Manager." icon_state = "com_headset" ks2type = /obj/item/device/encryptionkey/heads/hop /obj/item/device/radio/headset/heads/hop/alt name = "head of personnel's bowman headset" - desc = "The headset of the guy who will one day be Site Manager." + desc = "The headset of the poor fool who will one day be Site Manager." icon_state = "com_headset_alt" ks2type = /obj/item/device/encryptionkey/heads/hop @@ -279,13 +279,13 @@ /obj/item/device/radio/headset/headset_cargo name = "supply radio headset" - desc = "A headset used by the QM and his slaves." + desc = "A headset used by the QM and their cronies." icon_state = "cargo_headset" ks2type = /obj/item/device/encryptionkey/headset_cargo /obj/item/device/radio/headset/headset_cargo/alt name = "supply bowman headset" - desc = "A bowman headset used by the QM and his slaves." + desc = "A bowman headset used by the QM and their cronies." icon_state = "cargo_headset_alt" ks2type = /obj/item/device/encryptionkey/headset_cargo diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm index c8c8d376c80..3230eee1090 100644 --- a/code/game/objects/items/trash.dm +++ b/code/game/objects/items/trash.dm @@ -249,12 +249,15 @@ drop_sound = 'sound/items/drop/soda.ogg' pickup_sound = 'sound/items/pickup/soda.ogg' +<<<<<<< HEAD /obj/item/trash/tomato name = "empty tomato soup can" icon_state = "tomato" drop_sound = 'sound/items/drop/soda.ogg' pickup_sound = 'sound/items/pickup/soda.ogg' +======= +>>>>>>> 69ba99b5e6e... /tg/ era language pass (#8962) /obj/item/trash/spinach name = "empty spinach can" icon_state = "spinach" @@ -350,7 +353,11 @@ drop_sound = 'sound/items/drop/soda.ogg' pickup_sound = 'sound/items/pickup/soda.ogg' +<<<<<<< HEAD /obj/item/trash/spacercake_wrap +======= +/obj/item/trash/spacer_cake_wrap +>>>>>>> 69ba99b5e6e... /tg/ era language pass (#8962) name = "snack cake wrapper" icon_state = "spacercake_wrap" @@ -416,6 +423,7 @@ name = "burrito packaging" icon_state = "smolburrito" +<<<<<<< HEAD /obj/item/trash/brainzsnax name = "\improper BrainzSnax can" icon_state = "brainzsnax" @@ -426,4 +434,9 @@ name = "\improper BrainzSnax RED can" icon_state = "brainzsnaxred" drop_sound = 'sound/items/drop/soda.ogg' - pickup_sound = 'sound/items/pickup/soda.ogg' \ No newline at end of file + pickup_sound = 'sound/items/pickup/soda.ogg' +======= +/obj/item/trash/candybowl + name = "candy bowl" + icon_state = "candy_bowl" +>>>>>>> 69ba99b5e6e... /tg/ era language pass (#8962) diff --git a/code/game/objects/items/weapons/AI_modules.dm b/code/game/objects/items/weapons/AI_modules.dm index 0c318fc8dd9..95570cc16ca 100644 --- a/code/game/objects/items/weapons/AI_modules.dm +++ b/code/game/objects/items/weapons/AI_modules.dm @@ -429,9 +429,15 @@ AI MODULES /******************** Syndicate Directives ********************/ +<<<<<<< HEAD /obj/item/weapon/aiModule/syndicate_override name = "\improper 'Syndicate Directives' core AI module" desc = "A 'Syndicate Directives' Core AI Module: 'Reconfigures the AI's core laws.'" +======= +/obj/item/aiModule/syndicate_override + name = "\improper 'Mercenary Directives' core AI module" + desc = "A 'Mercenary Directives' Core AI Module: 'Reconfigures the AI's core laws.'" +>>>>>>> 69ba99b5e6e... /tg/ era language pass (#8962) origin_tech = list(TECH_DATA = 4, TECH_ILLEGAL = 4) laws = new/datum/ai_laws/syndicate_override() diff --git a/code/game/objects/items/weapons/chewables.dm b/code/game/objects/items/weapons/chewables.dm index 59e95f103fb..572ae2a68c3 100644 --- a/code/game/objects/items/weapons/chewables.dm +++ b/code/game/objects/items/weapons/chewables.dm @@ -267,7 +267,11 @@ color = reagents.get_color() update_icon() +<<<<<<< HEAD /obj/item/weapon/storage/box/pocky //ADDITION 04/17/2021 +======= +/obj/item/storage/box/pocky +>>>>>>> 69ba99b5e6e... /tg/ era language pass (#8962) name = "\improper Totemo yoi Pocky" desc = "A bundle of chocolate-coated bisquit sticks." icon = 'icons/obj/food_snacks.dmi' @@ -282,7 +286,7 @@ foldable = null trash = /obj/item/trash/pocky -/obj/item/clothing/mask/chewable/candy/pocky //ADDITION 04/17/2021 +/obj/item/clothing/mask/chewable/candy/pocky name = "chocolate pocky" desc = "A chocolate-coated biscuit stick." icon_state = "pockystick" diff --git a/code/game/objects/items/weapons/flamethrower.dm b/code/game/objects/items/weapons/flamethrower.dm index 8eba05ddd54..b20a44650ef 100644 --- a/code/game/objects/items/weapons/flamethrower.dm +++ b/code/game/objects/items/weapons/flamethrower.dm @@ -183,7 +183,7 @@ //TODO: DEFERRED Consider checking to make sure tank pressure is high enough before doing this... //Transfer 5% of current tank air contents to turf var/datum/gas_mixture/air_transfer = ptank.air_contents.remove_ratio(0.02*(throw_amount/100)) - //air_transfer.toxins = air_transfer.toxins * 5 // This is me not comprehending the air system. I realize this is retarded and I could probably make it work without fucking it up like this, but there you have it. -- TLE + //air_transfer.toxins = air_transfer.toxins * 5 // This is me not comprehending the air system. I realize this is mischievious and I could probably make it work without fucking it up like this, but there you have it. -- TLE new/obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel(target,air_transfer.gas["phoron"],get_dir(loc,target)) air_transfer.gas["phoron"] = 0 target.assume_air(air_transfer) diff --git a/code/game/objects/items/weapons/id cards/station_ids.dm b/code/game/objects/items/weapons/id cards/station_ids.dm index 9d1d52109a6..f7b1f3b1972 100644 --- a/code/game/objects/items/weapons/id cards/station_ids.dm +++ b/code/game/objects/items/weapons/id cards/station_ids.dm @@ -147,7 +147,7 @@ /obj/item/weapon/card/id/gold/captain/spare name = "\improper Site Manager's spare ID" - desc = "The spare ID of the High Lord himself." + desc = "The emergency spare ID for the station's very own Big Cheese." icon_state = "gold-id-alternate" registered_name = "Site Manager" diff --git a/code/game/objects/items/weapons/id cards/syndicate_ids.dm b/code/game/objects/items/weapons/id cards/syndicate_ids.dm index 0c36756bcca..6a8c574719a 100644 --- a/code/game/objects/items/weapons/id cards/syndicate_ids.dm +++ b/code/game/objects/items/weapons/id cards/syndicate_ids.dm @@ -87,10 +87,18 @@ /datum/card_state/dd_SortValue() return name +<<<<<<< HEAD /obj/item/weapon/card/id/syndicate_command name = "syndicate ID card" desc = "An ID straight from the Syndicate." registered_name = "Syndicate" assignment = "Syndicate Commander" +======= +/obj/item/card/id/syndicate_command + name = "operative ID card" + desc = "An ID straight from a mercenary organisation." + registered_name = "Operative" + assignment = "Operative Commander" +>>>>>>> 69ba99b5e6e... /tg/ era language pass (#8962) icon_state = "syndicate-id" access = list(access_syndicate, access_external_airlocks) diff --git a/code/game/objects/items/weapons/manuals.dm b/code/game/objects/items/weapons/manuals.dm index b36400319e0..5a5ecd823c5 100644 --- a/code/game/objects/items/weapons/manuals.dm +++ b/code/game/objects/items/weapons/manuals.dm @@ -317,7 +317,7 @@

Power outage

- A power problem has made the entire station lose power? Could be station-wide wiring problems or syndicate power sinks. In any case follow these steps: + A power problem has made the entire station lose power? Could be station-wide wiring problems or illegal power sinks. In any case follow these steps:
  1. PANIC!
    2. @@ -1112,7 +1112,7 @@ name = "Fission Mailed: Nuclear Sabotage 101" icon_state ="bookNuclear" item_state = "book8" - author = "Syndicate" + author = "Stealth Assault Enterprises" title = "Fission Mailed: Nuclear Sabotage 101" dat = {" @@ -1128,7 +1128,7 @@

    Nuclear Explosives 101

    - Hello and thank you for choosing the Syndicate for your nuclear information needs. Today's crash course will deal with the operation of a Nuclear Fission Device.

    + Hello and thank you for choosing Stealth Assault Enterprises for your nuclear information needs. Today's crash course will deal with the operation of a Nuclear Fission Device.

    First and foremost, DO NOT TOUCH ANYTHING UNTIL THE BOMB IS IN PLACE. Pressing any button on the compacted bomb will cause it to extend and bolt itself into place. If this is done, to unbolt it, one must completely log in, which at this time may not be possible.
    @@ -1144,7 +1144,7 @@ You now have activated the device. To deactivate the buttons at anytime, for example when you've already prepped the bomb for detonation, remove the authentication disk OR press R on the keypad.

    Now the bomb CAN ONLY be detonated using the timer. Manual detonation is not an option. Toggle off the SAFETY.
    - Note: You wouldn't believe how many Syndicate Operatives with doctorates have forgotten this step.

    + Note: You wouldn't believe how many SAARE Operatives with doctorates have forgotten this step.

    So use the - - and + + to set a detonation time between 5 seconds and 10 minutes. Then press the timer toggle button to start the countdown. Now remove the authentication disk so that the buttons deactivate.
    Note: THE BOMB IS STILL SET AND WILL DETONATE

    diff --git a/code/game/objects/items/weapons/storage/toolbox.dm b/code/game/objects/items/weapons/storage/toolbox.dm index bd80bf247e0..1696aa5dd35 100644 --- a/code/game/objects/items/weapons/storage/toolbox.dm +++ b/code/game/objects/items/weapons/storage/toolbox.dm @@ -3,8 +3,13 @@ */ /obj/item/weapon/storage/toolbox name = "toolbox" +<<<<<<< HEAD desc = "Danger. Very robust." icon = 'icons/obj/storage_vr.dmi' +======= + desc = "A metal toolbox with remarkably robust construction." + icon = 'icons/obj/storage.dmi' +>>>>>>> 69ba99b5e6e... /tg/ era language pass (#8962) icon_state = "red" item_state_slots = list(slot_r_hand_str = "toolbox_red", slot_l_hand_str = "toolbox_red") center_of_mass = list("x" = 16,"y" = 11) diff --git a/code/game/objects/structures/janicart.dm b/code/game/objects/structures/janicart.dm index 84cb98b9635..43aeed44c19 100644 --- a/code/game/objects/structures/janicart.dm +++ b/code/game/objects/structures/janicart.dm @@ -370,7 +370,7 @@ GLOBAL_LIST_BOILERPLATE(all_janitorial_carts, /obj/structure/janitorialcart) -//old style retardo-cart +//old style mischievio-cart /obj/structure/bed/chair/janicart name = "janicart" icon = 'icons/obj/vehicles.dmi' diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm index 20ac0ffcaa3..fee2fc6a927 100644 --- a/code/game/objects/structures/signs.dm +++ b/code/game/objects/structures/signs.dm @@ -256,12 +256,12 @@ /obj/structure/sign/redcross name = "medbay" - desc = "The Intergalactic symbol of Medical institutions. You'll probably get help here." + desc = "An international symbol of medical institutions. You'll probably get help here." icon_state = "bluecross" /obj/structure/sign/greencross name = "medbay" - desc = "The Intergalactic symbol of Medical institutions. You'll probably get help here." + desc = "An international symbol of medical institutions. You'll probably get help here." icon_state = "bluecross2" /obj/structure/sign/goldenplaque diff --git a/code/game/turfs/flooring/flooring.dm b/code/game/turfs/flooring/flooring.dm index 6eb9ef43b2c..5c7e45871ce 100644 --- a/code/game/turfs/flooring/flooring.dm +++ b/code/game/turfs/flooring/flooring.dm @@ -189,7 +189,7 @@ var/list/flooring_types /decl/flooring/mud name = "mud" - desc = "STICKY AND WET!" + desc = "Wet and fragrant mud, bane of the freshly mopped floor." icon = 'icons/turf/outdoors.dmi' icon_base = "mud_dark" footstep_sounds = list("human" = list( @@ -200,7 +200,7 @@ var/list/flooring_types /decl/flooring/asteroid name = "coarse sand" - desc = "Gritty and unpleasant." + desc = "You got a pebble in your shoe just looking at it." icon = 'icons/turf/flooring/asteroid.dmi' icon_base = "asteroid" flags = TURF_REMOVE_SHOVEL | TURF_ACID_IMMUNE @@ -213,8 +213,8 @@ var/list/flooring_types 'sound/effects/footstep/asteroid5.ogg')) /decl/flooring/dirt - name = "dirt" - desc = "Gritty and unpleasant, just like dirt." + name = "soil" + desc = "Widely considered to be some of the planet's top soil." icon = 'icons/turf/outdoors.dmi' icon_base = "dirt-dark" flags = TURF_REMOVE_SHOVEL @@ -275,7 +275,7 @@ var/list/flooring_types /decl/flooring/carpet name = "carpet" - desc = "Imported and comfy." + desc = "Lush synthetic carpeting, perfectly engineered for easy cleaning." icon = 'icons/turf/flooring/carpet.dmi' icon_base = "carpet" build_type = /obj/item/stack/tile/carpet @@ -299,7 +299,7 @@ var/list/flooring_types build_type = /obj/item/stack/tile/carpet/blucarpet /decl/flooring/carpet/turcarpet - name = "tur carpet" + name = "turquoise carpet" icon_base = "turcarpet" build_type = /obj/item/stack/tile/carpet/turcarpet @@ -309,7 +309,7 @@ var/list/flooring_types build_type = /obj/item/stack/tile/carpet/sblucarpet /decl/flooring/carpet/gaycarpet - name = "clown carpet" + name = "pink carpet" icon_base = "gaycarpet" build_type = /obj/item/stack/tile/carpet/gaycarpet @@ -391,18 +391,19 @@ var/list/flooring_types 'sound/effects/footstep/floor5.ogg')) /decl/flooring/tiling/tech - desc = "Scuffed from the passage of countless greyshirts." + desc = "Metal floor tiles with a corrugated anti-slip texture." icon = 'icons/turf/flooring/techfloor.dmi' icon_base = "techfloor_gray" build_type = /obj/item/stack/tile/floor/techgrey can_paint = null /decl/flooring/tiling/tech/grid + desc = "Metal floor tiles with a barred anti-slip construction. Don't skin your knee!" icon_base = "techfloor_grid" build_type = /obj/item/stack/tile/floor/techgrid /decl/flooring/tiling/new_tile - name = "floor" + desc = "Metal floor tiles with a corrugated anti-slip texture." icon_base = "tile_full" flags = TURF_CAN_BREAK | TURF_CAN_BURN | TURF_IS_FRAGILE build_type = null @@ -530,8 +531,7 @@ var/list/flooring_types 'sound/effects/footstep/wood5.ogg')) /decl/flooring/wood/sif - name = "alien wooden floor" - desc = "Polished alien wood planks." + desc = "Polished wood planks made from sivian wood." icon = 'icons/turf/flooring/wood.dmi' icon_base = "sifwood" build_type = /obj/item/stack/tile/wood/sif @@ -604,7 +604,7 @@ var/list/flooring_types /decl/flooring/lava // Defining this in case someone DOES step on lava and survive. Somehow. name = "lava" - desc = "Lava. Y'know. Sets you on fire. AAAAAAAAAAA" + desc = "It may look inviting, but it will kill you, painfully." icon = 'icons/turf/outdoors.dmi' icon_base = "lava" is_plating = TRUE @@ -616,9 +616,10 @@ var/list/flooring_types /decl/flooring/concrete name = "concrete" - desc = "A flat area of concrete flooring." + desc = "A flat area of poured concrete flooring." icon = 'icons/turf/concrete.dmi' icon_base = "concrete" +<<<<<<< HEAD is_plating = FALSE //VOREStation edit. It's a lot cooler if it's actual tile. can_paint = 1 //VOREStation edit. Let's allow for some fun. can_engrave = 1 //VOREStation edit. Fun. @@ -634,3 +635,7 @@ var/list/flooring_types /decl/flooring/grass/seasonal_grass/dark name = "grass" icon_base = "darkgrass" +======= + is_plating = TRUE + plating_type = /decl/flooring/concrete +>>>>>>> 69ba99b5e6e... /tg/ era language pass (#8962) diff --git a/code/game/turfs/flooring/flooring_premade.dm b/code/game/turfs/flooring/flooring_premade.dm index efc8f3d2aaf..6eb0bbae194 100644 --- a/code/game/turfs/flooring/flooring_premade.dm +++ b/code/game/turfs/flooring/flooring_premade.dm @@ -271,6 +271,7 @@ /turf/simulated/floor/tiled/kafel_full name = "floor" + desc = "Ceramic tile flooring." icon_state = "kafel_full" initial_flooring = /decl/flooring/tiling/new_tile/kafel /turf/simulated/floor/tiled/kafel_full/white diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm index cf55eacec47..a20354272bd 100644 --- a/code/modules/awaymissions/corpse.dm +++ b/code/modules/awaymissions/corpse.dm @@ -111,7 +111,7 @@ corpseidaccess = "Syndicate" /obj/effect/landmark/corpse/syndicatecommando - name = "Syndicate Commando" + name = "Mercenary Commando" corpseuniform = /obj/item/clothing/under/syndicate corpsesuit = /obj/item/clothing/suit/space/void/merc corpseshoes = /obj/item/clothing/shoes/boots/swat diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index b2df62ef7c2..7fa89ef692b 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -159,7 +159,12 @@ /obj/item/clothing/suit/syndicatefake name = "red space suit replica" icon_state = "syndicate" +<<<<<<< HEAD desc = "A plastic replica of the syndicate space suit, you'll look just like a real murderous syndicate agent in this! This is a toy, it is not made for use in space!" +======= + default_worn_icon = 'icons/mob/spacesuit.dmi' + desc = "A plastic replica of a mercenary combat space suit, you'll look just like a real bloodthirsty mercenary in this! This is a toy, it is not made for use in space!" +>>>>>>> 69ba99b5e6e... /tg/ era language pass (#8962) w_class = ITEMSIZE_NORMAL allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency/oxygen,/obj/item/toy) flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL|HIDETIE|HIDEHOLSTER diff --git a/code/modules/economy/vending_machines.dm b/code/modules/economy/vending_machines.dm index 5c78eeca981..d43f096682f 100644 --- a/code/modules/economy/vending_machines.dm +++ b/code/modules/economy/vending_machines.dm @@ -903,9 +903,6 @@ /obj/item/weapon/reagent_containers/pill/adminordrazine = 10, /obj/item/weapon/tool/crowbar = 1) - -////////////////////ancient_vend (Hot Food - Old) (ADDED 04/11/2021)//////////////////////////////////////////////////// - /obj/machinery/vending/hotfood name = "\improper Hot Foods!" desc = "An old vending machine promising 'hot foods'. You doubt any of its contents are still edible." @@ -919,8 +916,6 @@ /obj/item/weapon/reagent_containers/food/snacks/old/taco = 2 ) -////////////////////weeb_vend (Nippon-tan!) (ADDED 04/11/2021)///////////////////////////////////////////////// - /obj/machinery/vending/weeb name = "\improper Nippon-tan!" desc = "A distressingly ethnic vending machine loaded with high sucrose low calorie for lack of better words snacks." @@ -952,8 +947,6 @@ /obj/item/weapon/reagent_containers/food/snacks/daifuku = 5 ) -////////////////////sol_vend (Mars Mart) (ADDED 04/11/2021)//////////////////////////////////////////////////// - /obj/machinery/vending/sol name = "\improper Sol-Snacks" desc = "A SolCentric vending machine dispensing a number of Sol-themed snacks, along with other foods." @@ -986,10 +979,6 @@ /obj/item/weapon/storage/box/admints = 2 ) -////////////////////snix_vend (Snix!) (ADDED 04/11/2021)//////////////////////////////////////////// - -//////a food variant of the boda machine - It carries slavic themed foods.. Mostly beer snacks.///// - /obj/machinery/vending/snix name = "\improper Snix" desc = "A snack vending machine, offering a selection of slavic beer snacks." @@ -1028,8 +1017,6 @@ /obj/item/weapon/reagent_containers/food/snacks/hakarl = 8 ) -////////////////////snl_vend (Shop-n-Large Snacks!) (ADDED 04/16/2021)////////////////////////////// - /obj/machinery/vending/snlvend name = "\improper Shop-n-Large Snacks!" desc = "A Shop-n-Large brand vending machine! Enjoy all your favorites!" @@ -1082,13 +1069,12 @@ /obj/item/weapon/reagent_containers/food/snacks/cookiesnack = 5 ) -///////////////////////Soviet Stuff/////////////////////////////////////// - /obj/machinery/vending/sovietsoda name = "BODA" desc = "An old sweet water vending machine, how did this end up here?" icon_state = "sovietsoda" product_ads = "For Tsar and Country.;Have you fulfilled your nutrition quota today?;Very nice!;We are simple people, for this is all we eat.;If there is a person, there is a problem. If there is no person, then there is no problem." +<<<<<<< HEAD products = list(/obj/item/weapon/reagent_containers/food/drinks/cans/boda = 30, /obj/item/weapon/reagent_containers/food/drinks/cans/redarmy = 15, /obj/item/weapon/reagent_containers/food/drinks/cans/arstbru = 15, @@ -1096,10 +1082,15 @@ /obj/item/weapon/reagent_containers/food/drinks/cans/kompot = 15) contraband = list(/obj/item/weapon/reagent_containers/food/drinks/cans/kvass = 10, /obj/item/weapon/reagent_containers/food/drinks/cans/bodaplus = 10) +======= + products = list(/obj/item/reagent_containers/food/drinks/cans/boda = 30, + /obj/item/reagent_containers/food/drinks/cans/kompot = 20) + contraband = list(/obj/item/reagent_containers/food/drinks/cans/kvass = 20) +>>>>>>> 69ba99b5e6e... /tg/ era language pass (#8962) idle_power_usage = 211 //refrigerator - believe it or not, this is actually the average power consumption of a refrigerated vending machine according to NRCan. vending_sound = "machines/vending/vending_cans.ogg" -/obj/machinery/vending/sovietvend //ADDITION 04/20/2021 +/obj/machinery/vending/sovietvend name = "Ration Station" desc = "An old ration vendor unit. How it even still functional?" icon = 'icons/obj/vending.dmi' @@ -1110,8 +1101,6 @@ /obj/item/weapon/reagent_containers/food/snacks/packaged/meatration = 8) contraband = list(/obj/item/weapon/reagent_containers/food/snacks/packaged/sweetration = 2) -///////////////////////Radical Renard/////////////////////////////////////// - /obj/machinery/vending/radren name = "Radical Renard Sodas" desc = "A softdrink vendor owned by a frontier based soda company that's been contracted by NanoTrasen" @@ -1139,9 +1128,6 @@ /obj/item/weapon/reagent_containers/food/drinks/cans/gingerale = 1) idle_power_usage = 211 //refrigerator - believe it or not, this is actually the average power consumption of a refrigerated vending machine according to NRCan. vending_sound = "machines/vending/vending_cans.ogg" - -///////////////////////Donk-Soft!/////////////////////////////////////// - /obj/machinery/vending/donksoft name = "Donk-Soft!" desc = "A toy vendor owned by Donk-Soft, a NanoTrasen sub-company." diff --git a/code/modules/food/food/cans.dm b/code/modules/food/food/cans.dm index 0cf2e2f5a24..8001d105161 100644 --- a/code/modules/food/food/cans.dm +++ b/code/modules/food/food/cans.dm @@ -198,7 +198,7 @@ /obj/item/weapon/reagent_containers/food/drinks/cans/kvass name = "\improper Kvass" desc = "A true Slavic soda." - description_fluff = "A classic slavic beverage which many Space Russians still enjoy to this day. Fun fact, it is actually considered a weak beer by non-russians." + description_fluff = "A classic slavic beverage which many space-faring slavs still enjoy to this day. Fun fact, it is actually considered a weak beer by non-russians." icon_state = "kvass" center_of_mass = list("x"=16, "y"=10) diff --git a/code/modules/food/food/snacks.dm b/code/modules/food/food/snacks.dm index 3201a3778cd..01bdad4ccb3 100644 --- a/code/modules/food/food/snacks.dm +++ b/code/modules/food/food/snacks.dm @@ -6433,7 +6433,7 @@ name = "\improper Suhariki" icon = 'icons/obj/food_snacks.dmi' icon_state = "croutons" - desc = "Fried bread cubes. Popular in Terran territories." + desc = "Fried bread cubes. Popular in some Solar territories." trash = /obj/item/trash/croutons filling_color = "#c6b17f" center_of_mass = list ("x"=15, "y"=9) @@ -6607,7 +6607,11 @@ .=..() reagents.add_reagent("capsaicin", 5) +<<<<<<< HEAD /obj/item/weapon/reagent_containers/food/snacks/sun_snax //ADDITION 04/14/2021 +======= +/obj/item/reagent_containers/food/snacks/sun_snax +>>>>>>> 69ba99b5e6e... /tg/ era language pass (#8962) name = "\improper Sun Snax!" icon = 'icons/obj/food_snacks.dmi' icon_state = "sun_snax" @@ -6707,7 +6711,11 @@ .=..() reagents.add_reagent("capsaicin",1) +<<<<<<< HEAD /obj/item/weapon/reagent_containers/food/snacks/wasabi_peas //ADDITION 04/14/2021 +======= +/obj/item/reagent_containers/food/snacks/wasabi_peas +>>>>>>> 69ba99b5e6e... /tg/ era language pass (#8962) name = "\improper Hadokikku Peas" icon = 'icons/obj/food_snacks.dmi' icon_state = "wasabi_peas" @@ -6913,7 +6921,7 @@ /obj/item/weapon/reagent_containers/food/snacks/canned/maps name = "\improper MAPS" icon_state = "maps" - desc = "A re-branding of a classic Terran snack! Contains mostly edible ingredients." + desc = "A re-branding of a classic Earth snack! Contains mostly edible ingredients." trash = /obj/item/trash/maps canned_open_state = "maps-open" filling_color = "#330066" @@ -7147,3 +7155,638 @@ /obj/item/weapon/reagent_containers/food/snacks/packaged/vendburrito/Initialize() . = ..() reagents.add_reagent("sodiumchloride", 1) +<<<<<<< HEAD +======= + +//Virgo Stuff + +/obj/item/reagent_containers/food/snacks/sliceable/sushi + name = "sushi roll" + desc = "A whole sushi roll! Slice it up and enjoy with some soy sauce and wasabi." + icon = 'icons/obj/food_syn.dmi' + icon_state = "sushi" + slice_path = /obj/item/reagent_containers/food/snacks/slice/sushi/filled + slices_num = 5 + bitesize = 5 + nutriment_desc = list("rice" = 5, "fish" = 5) + nutriment_amt = 15 + +/obj/item/reagent_containers/food/snacks/sliceable/sushi/Initialize() + . = ..() + reagents.add_reagent("protein", 10) + +/obj/item/reagent_containers/food/snacks/slice/sushi/filled + name = "piece of sushi" + desc = "A slice of a larger sushi roll, ready to devour." + icon = 'icons/obj/food_syn.dmi' + icon_state = "sushi_s" + bitesize = 5 + whole_path = /obj/item/reagent_containers/food/snacks/sliceable/sushi + +/obj/item/reagent_containers/food/snacks/slice/sushi/filled/filled + filled = TRUE + +/obj/item/reagent_containers/food/snacks/goulash + name = "goulash" + desc = "Hope you're Hungary!" + icon = 'icons/obj/food_syn.dmi' + icon_state = "goulash" + trash = /obj/item/trash/snack_bowl + nutriment_amt = 6 + nutriment_desc = list("meat" = 2, "vegetables" = 2, "seasoning" = 5) + +/obj/item/reagent_containers/food/snacks/goulash/Initialize() + . = ..() + reagents.add_reagent("protein", 3) //For meaty things. + reagents.add_reagent("water", 5) + + +/obj/item/reagent_containers/food/snacks/donerkebab + name = "doner kebab" + desc = "Traditional food of the very drunk. The meat is typically cooked on a vertical rotisserie." + icon = 'icons/obj/food_syn.dmi' + icon_state = "doner_kebab" + nutriment_amt = 5 + nutriment_desc = list("vegetables" = 2, "seasoned meat" = 5) + +/obj/item/reagent_containers/food/snacks/donerkebab/Initialize() + . = ..() + reagents.add_reagent("protein", 2) //For meaty things. + + +/obj/item/reagent_containers/food/snacks/roastbeef + name = "roast beef" + desc = "It's beef. It's roasted. It's been a staple of dining tradition for centuries." + icon = 'icons/obj/food_syn.dmi' + icon_state = "roastbeef" + trash = /obj/item/trash/plate + bitesize = 2 + nutriment_amt = 8 + nutriment_desc = list("cooked meat" = 5) + +/obj/item/reagent_containers/food/snacks/roastbeef/Initialize() + . = ..() + reagents.add_reagent("protein", 4) //For meaty things. + + +/obj/item/reagent_containers/food/snacks/reishicup + name = "reishi's cup" + desc = "A chocolate treat with an odd flavor." + icon = 'icons/obj/food_syn.dmi' + icon_state = "reishiscup" + bitesize = 6 + nutriment_amt = 3 + nutriment_desc = list("chocolate" = 4, "colors" = 2) + +/obj/item/reagent_containers/food/snacks/reishicup/Initialize() + . = ..() + reagents.add_reagent("psilocybin", 3) + +/obj/item/storage/box/wings //This is kinda like the donut box. + name = "wing basket" + desc = "A basket of chicken wings! Get some before they're all gone! Or maybe you're too late..." + icon = 'icons/obj/food_syn.dmi' + icon_state = "wings5" + var/icon_base = "wings" + var/startswith = 5 + max_storage_space = ITEMSIZE_COST_SMALL * 5 + can_hold = list(/obj/item/reagent_containers/food/snacks/chickenwing) + starts_with = list( + /obj/item/reagent_containers/food/snacks/chickenwing = 5 + ) + foldable = null + +/obj/item/storage/box/wings/Initialize() + . = ..() + update_icon() + return + +/obj/item/storage/box/wings/update_icon() + var/i = 0 + for(var/obj/item/reagent_containers/food/snacks/W in contents) + i++ + icon_state = "[icon_base][i]" + +/obj/item/reagent_containers/food/snacks/chickenwing + name = "chicken wing" + desc = "What flavor even is this? Buffalo? Barbecue? Or something more exotic?" + icon = 'icons/obj/food_syn.dmi' + icon_state = "wing" + bitesize = 3 + nutriment_amt = 2 + nutriment_desc = list("chicken" = 2, "unplacable flavor sauce" = 4) + +/obj/item/reagent_containers/food/snacks/chickenwing/Initialize() + . = ..() + reagents.add_reagent("protein", 1) + +/obj/item/reagent_containers/food/snacks/hotandsoursoup + name = "hot & sour soup" + desc = "A soup both spicy and sour from ancient Chinese cooking traditions. This one is made with tofu." + icon = 'icons/obj/food_syn.dmi' + icon_state = "hotandsoursoup" + trash = /obj/item/trash/asian_bowl + bitesize = 2 + nutriment_amt = 6 + nutriment_desc = list("spicyness" = 4, "sourness" = 4, "tofu" = 1) + +/obj/item/reagent_containers/food/snacks/hotandsoursoup/Initialize() + . = ..() + + +/obj/item/reagent_containers/food/snacks/kitsuneudon + name = "kitsune udon" + desc = "A purported favorite of kitsunes in ancient japanese myth: udon noodles, fried egg, and tofu." + icon = 'icons/obj/food_syn.dmi' + icon_state = "kitsuneudon" + trash = /obj/item/trash/asian_bowl + bitesize = 2 + nutriment_amt = 6 + nutriment_desc = list("fried egg" = 2, "egg noodles" = 4) + +/obj/item/reagent_containers/food/snacks/kitsuneudon/Initialize() + . = ..() + +/obj/item/reagent_containers/food/snacks/generalschicken + name = "general's chicken" + desc = "Sweet, spicy, and fried. General's Chicken has been around for more than five-hundred years now, and still tastes good." + icon = 'icons/obj/food_syn.dmi' + icon_state = "generaltso" + trash = /obj/item/trash/asian_bowl + bitesize = 2 + nutriment_amt = 6 + nutriment_desc = list("sweet and spicy sauce" = 5, "chicken" = 3) + +/obj/item/reagent_containers/food/snacks/generalschicken/Initialize() + . = ..() + reagents.add_reagent("protein", 4) + +/obj/item/reagent_containers/food/snacks/mammi + name = "mämmi" + desc = "Traditional finnish desert, some like it, others don't. It's drifting in some milk, add sugar!" + icon = 'icons/obj/food_syn.dmi' + icon_state = "mammi" + trash = /obj/item/trash/plate + bitesize = 3 + nutriment_amt = 3 + nutriment_desc = list("brothy sweet goodness" = 5) + +/obj/item/reagent_containers/food/snacks/mammi/Initialize() + . = ..() + +/obj/item/reagent_containers/food/snacks/lobster + name = "raw lobster" + desc = "A shifty lobster. You can try eating it, but its shell is extremely tough." + icon = 'icons/obj/food_syn.dmi' + bitesize = 0.1 + icon_state = "lobster_raw" + nutriment_amt = 5 + +/obj/item/reagent_containers/food/snacks/lobstercooked + name = "cooked lobster" + desc = "A luxurious plate of cooked lobster, its taste accentuated by lemon juice. Reinvigorating!" + icon = 'icons/obj/food_syn.dmi' + icon_state = "lobster_cooked" + trash = /obj/item/trash/plate + nutriment_amt = 20 + bitesize = 5 + nutriment_desc = list("lemon" = 2, "lobster" = 5, "salad" = 2) + +/obj/item/reagent_containers/food/snacks/lobstercooked/Initialize() + . = ..() + reagents.add_reagent("protein", 20) + reagents.add_reagent("tricordrazine", 5) + reagents.add_reagent("iron", 5) + +/obj/item/reagent_containers/food/snacks/cuttlefish + name = "raw cuttlefish" + desc = "It's an adorable squid! You couldn't possibly be thinking about eating this, right?" + icon = 'icons/obj/food_syn.dmi' + icon_state = "cuttlefish_raw" + bitesize = 10 + nutriment_amt = 5 + +/obj/item/reagent_containers/food/snacks/cuttlefishcooked + name = "cooked cuttlefish" + desc = "It's a roasted cuttlefish. Rubbery, squishy, an acquired taste." + icon = 'icons/obj/food_syn.dmi' + icon_state = "cuttlefish_cooked" + bitesize = 5 + nutriment_amt = 20 + nutriment_desc = list("cuttlefish" = 5, "rubber" = 5, "grease" = 1) + +/obj/item/reagent_containers/food/snacks/cuttlefishcooked/Initialize() + . = ..() + reagents.add_reagent("protein", 10) + +/obj/item/reagent_containers/food/snacks/sliceable/monkfish + name = "extra large monkfish" + desc = "It's a huge monkfish. Better clean it first, you can't possibly eat it like this." + icon = 'icons/obj/food48x48.dmi' + icon_state = "monkfish_raw" + bitesize = 2 + nutriment_amt = 30 + w_class = ITEMSIZE_HUGE //Is that a monkfish in your pocket, or are you just happy to see me? + slice_path = /obj/item/reagent_containers/food/snacks/monkfishfillet + slices_num = 6 + trash = /obj/item/reagent_containers/food/snacks/sliceable/monkfishremains + +/obj/item/reagent_containers/food/snacks/sliceable/monkfish/Initialize() + . = ..() + +/obj/item/reagent_containers/food/snacks/monkfishfillet + name = "monkfish fillet" + desc = "It's a fillet sliced from a monkfish." + icon = 'icons/obj/food_syn.dmi' + icon_state = "monkfish_fillet" + bitesize = 3 + nutriment_amt = 5 + +/obj/item/reagent_containers/food/snacks/monkfishfillet/Initialize() + . = ..() + reagents.add_reagent("protein", 1) + +/obj/item/reagent_containers/food/snacks/monkfishcooked + name = "seasoned monkfish" + desc = "A delicious slice of monkfish prepared with sweet chili and spring onion." + icon = 'icons/obj/food_syn.dmi' + icon_state = "monkfish_cooked" + bitesize = 4 + nutriment_amt = 10 + nutriment_desc = list("fish" = 3, "oil" = 1, "sweet chili" = 3, "spring onion" = 2) + +/obj/item/reagent_containers/food/snacks/monkfishcooked/Initialize() + . = ..() + reagents.add_reagent("protein", 5) + +/obj/item/reagent_containers/food/snacks/sliceable/monkfishremains + name = "monkfish remains" + icon = 'icons/obj/food_syn.dmi' + icon_state = "monkfish_remains" + desc = "The work of a madman." + w_class = ITEMSIZE_LARGE + bitesize = 0.01 //impossible to eat + nutriment_amt = 10 + slice_path = /obj/item/clothing/head/fish + slices_num = 1 + +/obj/item/reagent_containers/food/snacks/sliceable/monkfishremains/Initialize() + . = ..() + reagents.add_reagent("carbon", 5) + +/obj/item/reagent_containers/food/snacks/sliceable/sharkchunk + name = "chunk of shark meat" + desc = "Still rough, needs to be cut into even smaller chunks." + icon = 'icons/obj/food_syn.dmi' + icon_state = "sharkmeat_chunk" + bitesize = 3 + nutriment_amt = 15 + w_class = ITEMSIZE_LARGE + slice_path = /obj/item/reagent_containers/food/snacks/carpmeat/fish/sharkmeat + slices_num = 5 + +/obj/item/reagent_containers/food/snacks/sliceable/sharkchunk/Initialize() + . = ..() + reagents.add_reagent("protein", 20) + +/obj/item/reagent_containers/food/snacks/carpmeat/fish/sharkmeat + name = "slice of sharkmeat" + desc = "Now it's small enough to cook with." + icon = 'icons/obj/food_syn.dmi' + icon_state = "sharkmeat" + bitesize = 3 + nutriment_amt = 2 + toxin_amount = null + +/obj/item/reagent_containers/food/snacks/carpmeat/fish/sharkmeat/Initialize() + . = ..() + reagents.add_reagent("protein", 2) + +/obj/item/reagent_containers/food/snacks/sharkmeatcooked + name = "shark steak" + desc = "Finally, some food for real men." + icon = 'icons/obj/food_syn.dmi' + icon_state = "sharkmeat_cooked" + trash = /obj/item/trash/small_bowl + bitesize = 3 + nutriment_amt = 5 + trash = /obj/item/trash/plate + nutriment_desc = list("manliness" = 1, "fish oil" = 2, "shark" = 2) + +/obj/item/reagent_containers/food/snacks/sharkmeatcooked/Initialize() + . = ..() + reagents.add_reagent("protein", 8) + +/obj/item/reagent_containers/food/snacks/sharkmeatdip + name = "hot shark shank" + desc = "A shank of shark meat dipped in hot sauce." + icon = 'icons/obj/food_syn.dmi' + icon_state = "sharkmeat_dip" + bitesize = 3 + nutriment_amt = 5 + trash = /obj/item/trash/snack_bowl + nutriment_desc = list("salt" = 1, "fish oil" = 2, "spicy shark" = 2) + +/obj/item/reagent_containers/food/snacks/sharkmeatdip/Initialize() + . = ..() + reagents.add_reagent("capsaicin", 4) + reagents.add_reagent("protein", 4) + +/obj/item/reagent_containers/food/snacks/sharkmeatcubes + name = "shark cubes" + desc = "Foul scented fermented shark cubes, it's said to make men fly, or just make them really fat." + icon = 'icons/obj/food_syn.dmi' + icon_state = "sharkmeat_cubes" + bitesize = 10 + nutriment_amt = 8 + trash = /obj/item/trash/plate + nutriment_desc = list("viking spirit" = 1, "rot" = 2, "fermented sauce" = 2) + +/obj/item/reagent_containers/food/snacks/sharkmeatcubes/Initialize() + . = ..() + reagents.add_reagent("potatojuice", 30) // for people who want to get fat, FAST. + +/obj/item/reagent_containers/food/snacks/dynsoup + name = "dyn soup" + desc = "An imported skrellian recipe, with certain substitions for ingredients not commonly available outside of Skrellian space." + icon = 'icons/obj/food_syn.dmi' + icon_state = "dynsoup" + bitesize = 5 + nutriment_amt = 8 + nutriment_desc = list("peppermint" = 2, "salad" = 4, "hot stew" = 2) + +/obj/item/reagent_containers/food/snacks/dynsoup/Initialize() + . = ..() + reagents.add_reagent("water", 5) + reagents.add_reagent("dynjuice", 4) + reagents.add_reagent("tomatojuice", 4) + +/obj/item/reagent_containers/food/snacks/zantiri + name = "zantiri" + desc = "A soupy mush comprised of guami and eki, two plants native to Qerr'balak. In a bowl, it looks not unlike staring into a starry sky." + icon = 'icons/obj/food_syn.dmi' + icon_state = "zantiri" + bitesize = 5 + nutriment_amt = 9 + nutriment_desc = list("inky mush" = 5, "crunchy lichen" = 4) + +/obj/item/reagent_containers/food/snacks/zantiri/Initialize() + . = ..() + reagents.add_reagent("water", 6) + reagents.add_reagent("nutriment", 8) + +/obj/item/reagent_containers/food/snacks/stew/neaera + name = "neaera stew" + desc = "Neaera meat stewed in a mixture of water and dyn juice, garnished with guami and eki. Often cooked in large batches to feed many teshari pack members." + icon = 'icons/obj/food_syn.dmi' + icon_state = "neaera_stew" + filling_color = "#7C66DD" + nutriment_desc = list("meaty mushroom" = 6, "crunchy lichen" = 6, "peppermint" = 6) + +/obj/item/reagent_containers/food/snacks/stew/neaera/Initialize() + . = ..() + reagents.add_reagent("nutriment", 4) + reagents.add_reagent("seafood", 6) + reagents.add_reagent("dynjuice", 4) + +/obj/item/reagent_containers/food/snacks/chipplate/neaeracandy + name = "plate of candied neaera eyes" + desc = "Candied neaera eyes shaped into cubes. The mix of savoury and sweet is generally acceptable for most species, although many dislike the dish for its use of eyes." + icon_state = "neaera_candied_eyes20" + trash = /obj/item/trash/candybowl + vendingobject = /obj/item/reagent_containers/food/snacks/neaeracandy + nutriment_desc = list("creamy, fatty meat" = 20) + bitesize = 1 + unitname = "eye" + nutriment_amt = 20 + filling_color = "#7C66DD" + +/obj/item/reagent_containers/food/snacks/chipplate/neaeracandy/Initialize() + . = ..() + reagents.add_reagent("seafood", 20) + +/obj/item/reagent_containers/food/snacks/chipplate/neaeracandy/update_icon() + switch(reagents.total_volume) + if(1) + icon_state = "neaera_candied_eyes1" + if(2 to 5) + icon_state = "neaera_candied_eyes5" + if(6 to 10) + icon_state = "neaera_candied_eyes10" + if(11 to 15) + icon_state = "neaera_candied_eyes15" + if(20 to INFINITY) + icon_state = "neaera_candied_eyes20" + +/obj/item/reagent_containers/food/snacks/neaeracandy + name = "candied neaera eye" + desc = "A candied neaera eye shaped into a cube. The mix of savoury and sweet is generally acceptable for most species, although many dislike the dish for its use of eyes." + icon = 'icons/obj/food_syn.dmi' + icon_state = "neaera_candied_eye" + nutriment_desc = list("creamy, fatty meat" = 3) + bitesize = 2 + nutriment_amt = 3 + filling_color = "#7C66DD" + +/obj/item/reagent_containers/food/snacks/neaeracandy/Initialize() + . = ..() + reagents.add_reagent("seafood", 3) + +/obj/item/reagent_containers/food/snacks/neaerakabob + name = "neaera-kabob" + desc = "Neaera meat and giblets that have been cooked on a skewer." + icon = 'icons/obj/food_syn.dmi' + icon_state = "neaera_skewer" + trash = /obj/item/stack/rods + filling_color = "#7C66DD" + center_of_mass = list("x"=17, "y"=15) + nutriment_desc = list("fatty meat" = 2) + nutriment_amt = 4 + bitesize = 2 + +/obj/item/reagent_containers/food/snacks/neaeracandy/Initialize() + . = ..() + reagents.add_reagent("seafood", 4) + +/obj/item/reagent_containers/food/snacks/lortl + name = "lortl" + desc = "Dehydrated and salted q'lort slices, a very common Skrellian snack." + icon = 'icons/obj/hydroponics_misc.dmi' + filling_color = "#B7D6BF" + bitesize = 2 + nutriment_amt = 2 + nutriment_desc = list("dried fruit" = 2) + +/obj/item/reagent_containers/food/snacks/lortl/Initialize() + . = ..() + reagents.add_reagent("sodiumchloride", 2) + if(!fruit_icon_cache["rind-#B1E4BE"]) + var/image/I = image(icon,"fruit_rind") + I.color = "#B1E4BE" + fruit_icon_cache["rind-#B1E4BE"] = I + add_overlay(fruit_icon_cache["rind-#B1E4BE"]) + if(!fruit_icon_cache["slice-#B1E4BE"]) + var/image/I = image(icon,"fruit_slice") + I.color = "#9FE4B0" + fruit_icon_cache["slice-#B1E4BE"] = I + add_overlay(fruit_icon_cache["slice-#B1E4BE"]) + +/obj/item/reagent_containers/food/snacks/qalozynboiled + name = "boiled qa'lozyn" + desc = "A Qerr'balakian vegetable. Poisonous raw, but rendered edible by boiling." + icon = 'icons/obj/food_syn.dmi' + icon_state = "qalozyn_boiled" + nutriment_amt = 4 + nutriment_desc = list("sweet turnips" = 4) + bitesize = 2 + filling_color = "#7C66DD" + +/obj/item/reagent_containers/food/snacks/garani + name = "garani" + icon = 'icons/obj/food_syn.dmi' + desc = "Neaera liver stuffed with boiled qa'lozyn and fried in oil. A popular light meal for teshari." + icon_state = "garani" + nutriment_amt = 8 + nutriment_desc = list("fatty meat" = 4, "sweet turnips" = 4) + bitesize = 3 + filling_color = "#7C66DD" + +/obj/item/reagent_containers/food/snacks/ganami/Initialize() + . = ..() + reagents.add_reagent("seafood", 4) + +/obj/item/reagent_containers/food/snacks/qazal_dough + name = "qa'zal dough" + icon = 'icons/obj/food_syn.dmi' + desc = "A coarse, stretchy, skrellian dough made from qa'zal flour and ga'uli juice in a striking purple color." + icon_state = "qazal_dough" + bitesize = 2 + nutriment_amt = 3 + nutriment_desc = list("minty dough" = 3) + filling_color = "#B97BD9" + +/obj/item/reagent_containers/food/snacks/qazal_dough/attackby(obj/item/W as obj, mob/user as mob) + if(istype(W,/obj/item/material/kitchen/rollingpin)) + new /obj/item/reagent_containers/food/snacks/sliceable/qazal_flatdough(src) + to_chat(user, "You flatten the dough.") + qdel(src) + +/obj/item/reagent_containers/food/snacks/sliceable/qazal_flatdough + name = "flattened qa'zal dough" + icon = 'icons/obj/food_syn.dmi' + desc = "A flattened, stretchy purple dough" + icon_state = "flat_qazal_dough" + bitesize = 2 + nutriment_amt = 3 + nutriment_desc = list("minty dough" = 3) + slice_path = /obj/item/reagent_containers/food/snacks/qazal_doughstrip + slices_num = 3 + filling_color = "#B97BD9" + +/obj/item/reagent_containers/food/snacks/qazal_doughstrip + name = "qa'zal dough strip" + icon = 'icons/obj/food_syn.dmi' + desc = "Thick-cut segments of qa'zal dough formed into what resembles a chewy, purple pasta." + icon_state = "qazal_pasta" + bitesize = 2 + nutriment_amt = 3 + nutriment_desc = list("minty pasta" = 1) + filling_color = "#B97BD9" + +/obj/item/reagent_containers/food/snacks/sliceable/qazal_bread + name = "qa'zal bread" + icon = 'icons/obj/food_syn.dmi' + desc = "A loaf of soft qa'zal bread in a striking dark purple color, ready to be cut into slices. It's surprisingly stretchy, and smells quite minty." + icon_state = "qazal_loaf" + nutriment_amt = 20 + slices_num = 5 + nutriment_desc = list("minty bread" = 5) + slice_path = /obj/item/reagent_containers/food/snacks/slice/qazal_bread_slice + filling_color = "#B97BD9" + +/obj/item/reagent_containers/food/snacks/slice/qazal_bread_slice + name = "qa'zal bread slice" + icon = 'icons/obj/food_syn.dmi' + desc = "A slice of stretchy qa'zal bread." + icon_state = "qazal_bread_slice" + whole_path = /obj/item/reagent_containers/food/snacks/sliceable/qazal_bread + nutriment_desc = list("minty bread" = 1) + filling_color = "#B97BD9" + +/obj/item/reagent_containers/food/snacks/slice/qazal_bread_slice/filled + filled = TRUE + +/obj/item/reagent_containers/food/snacks/grilled_qazal_flatbread + name = "grilled qa'zal flatbread" + desc = "Crispy, grilled qa'zal flatbread. No longer as stretchy, but it smells absolutely amazing." + icon = 'icons/obj/food_syn.dmi' + icon_state = "grilled_qazal_flatbread" + nutriment_amt = 8 + bitesize = 1 + nutriment_desc = list("minty flatbread" = 1) + filling_color = "#B97BD9" + +/obj/item/reagent_containers/food/snacks/baked_gauli + name = "baked ga'uli" + icon = 'icons/obj/food_syn.dmi' + desc = "A ga'uli pod baked in an oven, causing the minty liquid inside to condense and the exterior to soften, giving the vegetable a hard-boiled egg consistency. Remarkably tasty and healthy!" + icon_state = "baked_gauli" + nutriment_amt = 4 + nutriment_desc = list("zesty mintyness" = 1) + filling_color = "#B97BD9" + +/obj/item/reagent_containers/food/snacks/baked_kirani + name = "baked kirani" + icon = 'icons/obj/food_syn.dmi' + desc = "A kirani fruit baked in an oven, causing the jelly inside to caramelize into a jelly donut-like crispy treat." + icon_state = "baked_kirani" + nutriment_amt = 4 + nutriment_desc = list("crispy sweetness" = 2, "caramelized jelly" = 2) + filling_color = "#993C5C" + +/obj/item/reagent_containers/food/snacks/stuffed_gauli + name = "stuffed ga'uli pod" + desc = "A cooked ga'uli pod, stuffed with meat and minced kirani fruit." + icon = 'icons/obj/food_syn.dmi' + icon_state = "stuffed_gauli_pod" + nutriment_amt = 4 + bitesize = 1 + nutriment_desc = list("meat" = 1, "sweet kirani" = 1, "minty ga'uli" = 1) + +/obj/item/reagent_containers/food/snacks/stuffed_gauli/Initialize() + . = ..() + reagents.add_reagent("protein", 4, nutriment_desc) + +/obj/item/reagent_containers/food/snacks/kirani_stew + name = "kirani stew" + desc = "Meat mixed with finely sliced qa'zal, drizzled in kirani jelly sauce, just the perfect balance of savory and sweet." + icon = 'icons/obj/food_syn.dmi' + icon_state = "kirani_stew" + nutriment_amt = 8 + trash = /obj/item/trash/snack_bowl + bitesize = 1 + nutriment_desc = list("minty qa'zal" = 1, "sweet kirani jelly" = 1) + +/obj/item/reagent_containers/food/snacks/kirani_stew/Initialize() + . = ..() + reagents.add_reagent("protein", 4, nutriment_desc) + +/obj/item/reagent_containers/food/snacks/qazal_noodles + name = "qa'zal noodles" + desc = "Qa'zal pasta mixed in a bowl with chopped kirani fruit and gu'ali pods. It looks bizarre and seems kind of slimy, but the taste cannot be denied." + icon = 'icons/obj/food_syn.dmi' + icon_state = "qazal_noodles" + trash = /obj/item/trash/snack_bowl + nutriment_amt = 8 + bitesize = 1 + nutriment_desc = list("chewy qa'zal noodles" = 1, "minty gu'ali juice" = 1, "sweet kirani jelly" = 1) + +/obj/item/reagent_containers/food/snacks/kirani_jellypuff + name = "kirani jellypuff" + desc = "A piece of qa'zal bread containing a kirani jelly filling and sprinkled with qa'zal flour. Just one will never be enough." + icon = 'icons/obj/food_syn.dmi' + icon_state = "kirani_jellypuff" + nutriment_amt = 8 + bitesize = 2 + nutriment_desc = list("puffed minty qa'zal bread" = 1, "super-sweet kirani jelly" = 1) +>>>>>>> 69ba99b5e6e... /tg/ era language pass (#8962) diff --git a/code/modules/lore_codex/lore_data/political_parties.dm b/code/modules/lore_codex/lore_data/political_parties.dm index 29dd7fb741c..6448a3c79e3 100644 --- a/code/modules/lore_codex/lore_data/political_parties.dm +++ b/code/modules/lore_codex/lore_data/political_parties.dm @@ -82,7 +82,7 @@ /datum/lore/codex/page/multinational_movement/add_content() name = "Multinational Movement" keywords += list("Multinational") - data = "The barely-unified voice of [quick_link("SolGov", "SolGov's")] various independence movements, encompassing Terran governments wishing for a lighter touch \ + data = "The barely-unified voice of [quick_link("SolGov", "SolGov's")] various independence movements, encompassing Earth governments wishing for a lighter touch \ from SolGov, fringe colonies who balk at the call of distant masters, anarchist movements who want the freedom to live without government oversight, and the rare \ Trans-Stellar who no longer see a benefit in working with SolGov. Full colonial independence is still a political impossibility so long as the \ [quick_link("Icarus Front")] holds any sway, and so the Movement is focused primarily on securing more autonomy in governance, although a growing revolutionary sub-group \ @@ -96,4 +96,4 @@ measures to reduce the amount of power held by the TSCs. In many ways a holdover from the days before the [quick_link("Shadow Coalition")], where corporate malfeasance took \ the place of technological development as the primary issue of debate, the FTU has found itself adopting technological positions similar to the SEO as a matter \ of pragmatism, although the views of individual members vary. The FTU is known for their intense lobbying of SolGov to add tax rebates to the purchases of \ - personal lathes and the creation of open-source firmware for experimental autolathes, but have thus far found little success." \ No newline at end of file + personal lathes and the creation of open-source firmware for experimental autolathes, but have thus far found little success." diff --git a/code/modules/lore_codex/news_data/main.dm b/code/modules/lore_codex/news_data/main.dm index 3366f2d0a56..6f2c32cf545 100644 --- a/code/modules/lore_codex/news_data/main.dm +++ b/code/modules/lore_codex/news_data/main.dm @@ -468,7 +468,7 @@

    \ I don't see this whole affair as a chance to spread the galactic anti-corporate revolution the way President Fisher does, of course. I make no secret of my stance on Trans-Stellars, but I also know that we're better off with Sol than without. The 'Silent Collapse' was two hundred years ago, but we still bear the scars from it. When the Scandinavian Union pulled out support for the Sivian colonization project, SolGov saved us. I do mean saved us, sure as if they'd fished us out of a life pod. There were no factories, no steel, no concrete on Sif until the Engineering Corps built Radiance and New Reykjavik. Corporations and regional governments cowered from the Karan pirates, until the Marines chased them out. Whether Sivian or Karan, you owe the roof over your head to the Sol Confederate Government. With that great debt in mind, how dare we turn our backs on the Bowl, or Abel's Rest, or Nyx, when they need us! How dare we let oligarchs prey on the weak! How dare we choose not to act when we have, by virtue of our votes in the Assembly and our voice within the halls of public debate, the means to share our peace and prosperity with the rest of our people!\

    \ - This is what I mean by SolGov being the only true republic, the only state founded for the common good. The 'human spirit' West croons on about isn't our industriousness, or our skill at arms. If humanity-- if this Terran culture is commendable for anything, it is that we assist our fellows. We take in Casteless Skrell, Unbound Unathi, republican Tajaran. We pass around the hat when someone's house burns down. We help our friends, our neighbors, and even strangers. The fact that Martei and Harper are perverting this impulse, padding their juntas with the air of legitimacy to inspire honest people to ride to their defense, is the reason their state is unconscionable, the reason it was was born flawed, the reason we cannot suffer it to continue, much less help it on its way.\ + This is what I mean by SolGov being the only true republic, the only state founded for the common good. The 'human spirit' West croons on about isn't our industriousness, or our skill at arms. If humanity-- if this Solar culture is commendable for anything, it is that we assist our fellows. We take in Casteless Skrell, Unbound Unathi, republican Tajaran. We pass around the hat when someone's house burns down. We help our friends, our neighbors, and even strangers. The fact that Martei and Harper are perverting this impulse, padding their juntas with the air of legitimacy to inspire honest people to ride to their defense, is the reason their state is unconscionable, the reason it was was born flawed, the reason we cannot suffer it to continue, much less help it on its way.\

    \ Now, I'm sure you've noticed by now, that I haven't said much more than three words about technoprogressivism, or transtech, or whatever the word du jour is. Frankly, that's on purpose. 'Transtech' has never once been about technology. The Icarus Front-- the old one, that united us and took us to the stars, not the new one we spend forty hours a week arguing with about healthcare-- The Icarus Front was a popular revolution, you know. Hel, they were Marxists. It was a world where the kind of lack of accountability, the entrenched oligarchy and geographical class divide that we're dealing with now was spiraling out of control. In the old United States, the rich and powerful got the technology to grow loyal subjects in tubes, to make drone intelligences smarter in some ways than a human could ever be, to-- well, to do what Angessa Martei's done, only with no SolGov to stop her. Meanwhile, the 'little people' in the Middle East, Southeast Asia, and other 'forgotten' parts of the world were left behind, hopelessly. I don't mean to downplay the importance of the Gray Tide, but if you look at historical accounts from that era, the thing that really united the Front was the knowledge that, if they didn't act immediately, they'd be seen as 'externalities' by immortal superintelligent businesspeople and politicians. The take-away from the Gray Tide should never have been that 'nanotechnology is dangerous'-- it should have been 'nobody should be able to destroy an entire city without facing consequences.'\

    \ diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm index ece68c7a08c..9cff48c9bac 100644 --- a/code/modules/mining/mine_turfs.dm +++ b/code/modules/mining/mine_turfs.dm @@ -653,7 +653,7 @@ var/list/mining_overlay_cache = list() /turf/simulated/mineral/proc/artifact_debris(var/severity = 0) //cael's patented random limited drop componentized loot system! - //sky's patented not-fucking-retarded overhaul! + //sky's patented non-mischievious overhaul! //Give a random amount of loot from 1 to 3 or 5, varying on severity. for(var/j in 1 to rand(1, 3 + max(min(severity, 1), 0) * 2)) diff --git a/code/modules/mob/dead/corpse.dm b/code/modules/mob/dead/corpse.dm index 18d81bf484a..1b422aae65c 100644 --- a/code/modules/mob/dead/corpse.dm +++ b/code/modules/mob/dead/corpse.dm @@ -114,7 +114,7 @@ corpseidaccess = "Syndicate" /obj/effect/landmark/mobcorpse/syndicatecommando - name = "Syndicate Commando" + name = "Mercenary Commando" corpseuniform = /obj/item/clothing/under/syndicate corpsesuit = /obj/item/clothing/suit/space/void/merc corpseshoes = /obj/item/clothing/shoes/boots/swat diff --git a/code/modules/mob/living/living_defines.dm b/code/modules/mob/living/living_defines.dm index 031d6ddb89a..5a4767c957a 100644 --- a/code/modules/mob/living/living_defines.dm +++ b/code/modules/mob/living/living_defines.dm @@ -15,7 +15,7 @@ var/toxloss = 0.0 //Toxic damage caused by being poisoned or radiated var/fireloss = 0.0 //Burn damage caused by being way too hot, too cold or burnt. var/cloneloss = 0 //Damage caused by being cloned or ejected from the cloner early. slimes also deal cloneloss damage to victims - var/brainloss = 0 //'Retardation' damage caused by someone hitting you in the head with a bible or being infected with brainrot. + var/brainloss = 0 //Thought-scrambly damage caused by someone hitting you in the head with a bible or being infected with brainrot. var/halloss = 0 //Hallucination damage. 'Fake' damage obtained through hallucinating or the holodeck. Sleeping should cause it to wear off. var/nutrition = 400 diff --git a/code/modules/reagents/machinery/dispenser/reagent_tank.dm b/code/modules/reagents/machinery/dispenser/reagent_tank.dm index df1af4cfd85..cf2d5570818 100644 --- a/code/modules/reagents/machinery/dispenser/reagent_tank.dm +++ b/code/modules/reagents/machinery/dispenser/reagent_tank.dm @@ -492,3 +492,17 @@ reagents.splash_area(get_turf(src), 3) visible_message(span("danger", "The [src] bursts open, spreading oil all over the area.")) qdel(src) +<<<<<<< HEAD +======= + +/obj/structure/reagent_dispensers/he3 + name = "fueltank" + desc = "A fueltank." + icon = 'icons/obj/objects.dmi' + icon_state = "weldtank" + amount_per_transfer_from_this = 10 + +/obj/structure/reagent_dispensers/he3/Initialize() + . = ..() + reagents.add_reagent("helium3",1000) +>>>>>>> 69ba99b5e6e... /tg/ era language pass (#8962) diff --git a/code/modules/reagents/reagents/food_drinks.dm b/code/modules/reagents/reagents/food_drinks.dm index 2b16a45f46f..c1171b2b9c7 100644 --- a/code/modules/reagents/reagents/food_drinks.dm +++ b/code/modules/reagents/reagents/food_drinks.dm @@ -4515,8 +4515,6 @@ nutriment_factor = 40 //very filling color = "#d169b2" -//ADDITIONS BELOW THIS LINE MADE ON 04/03/2021 - /datum/reagent/drink/soda/kompot name = "Kompot" id = "kompot" @@ -4539,3 +4537,62 @@ nutriment_factor = 2 glass_name = "kvass" glass_desc = "A hearty glass of Slavic brew." +<<<<<<< HEAD +======= + +//Querbalak stuff +/datum/reagent/drink/juice/dyn + name = "Dyn juice" + id = "dynjuice" + description = "Juice from a Qerr'balakian herb. Good for you, but usually diluted for potability." + taste_description = "astringent menthol" + color = "#00e0e0" + glass_name = "dyn juice" + glass_desc = "Juice from a Qerr'balakian herb. Good for you, but usually diluted for potability." + sugary = FALSE + +/datum/reagent/drink/tea/dyn + name = "Dyn tea" + id = "dynhot" + description = "A traditional skrellian drink with documented medicinal properties." + color = "#00e0e0" + taste_description = "peppermint water" + allergen_type = null //no caffine here + glass_name = "dyn tea" + glass_desc = "An old-fashioned, but traditional skrellian drink with documented medicinal properties." + cup_name = "cup of dyn tea" + cup_desc = "An old-fashioned, but traditional skrellian drink with documented medicinal properties." + +/datum/reagent/drink/tea/icetea/dyn + name = "Dyn iced tea" + id = "dyncold" + description = "A modern spin on an old formula. Good for you!" + color = "#00e0e0" + taste_description = "fizzy mint tea" + allergen_type = null + glass_name = "dyn iced tea" + glass_desc = "A modern spin on an old formula. Good for you!" + +/datum/reagent/nutriment/qazal_flour + name = "Qa'zal flour" + id = "qazal_flour" + description = "Harvested from ground qa'zal, this is one of the main ingredients in qa'zal bread." + taste_description = "chalky, sweet dryness" + reagent_state = SOLID + nutriment_factor = 1 + color = "#c499bc" + +/datum/reagent/nutriment/kirani_jelly + name = "Kirani jelly" + id = "kirani_jelly" + description = "Sticky, sweet jelly from ground kiriani fruits." + taste_description = "ultra-sweet jelly" + color = "#993c5c" + +/datum/reagent/drink/gauli_juice + name = "Ga'uli juice" + id = "gauli_juice" + description = "Juice from a ga'uli pod, used in skrellian and teshari cooking." + color = "#6f83a6" + taste_description = "mintyness" +>>>>>>> 69ba99b5e6e... /tg/ era language pass (#8962) diff --git a/code/modules/virus2/helpers.dm b/code/modules/virus2/helpers.dm index 18a8bb24e8a..053498042ef 100644 --- a/code/modules/virus2/helpers.dm +++ b/code/modules/virus2/helpers.dm @@ -136,7 +136,7 @@ /mob/living/carbon/proc/spread_disease_to(var/mob/living/carbon/victim, var/vector = "Airborne") if (src == victim) - return "retardation" + return "Neurodegeneration" // log_debug("Spreading [vector] diseases from [src] to [victim]") if (virus2.len > 0) diff --git a/code/modules/xgm/xgm_gas_mixture.dm b/code/modules/xgm/xgm_gas_mixture.dm index 1e363f35c9f..fd52efca22c 100644 --- a/code/modules/xgm/xgm_gas_mixture.dm +++ b/code/modules/xgm/xgm_gas_mixture.dm @@ -420,10 +420,10 @@ if(full_heat_capacity + s_full_heat_capacity) temp_avg = (temperature * full_heat_capacity + other.temperature * s_full_heat_capacity) / (full_heat_capacity + s_full_heat_capacity) - //WOOT WOOT TOUCH THIS AND YOU ARE A RETARD. + //WOOT WOOT TOUCH THIS AND YOU ARE A MISCHIEVIOUS LITTLE ELF if(sharing_lookup_table.len >= connecting_tiles) //6 or more interconnecting tiles will max at 42% of air moved per tick. ratio = sharing_lookup_table[connecting_tiles] - //WOOT WOOT TOUCH THIS AND YOU ARE A RETARD + //WOOT WOOT TOUCH THIS AND YOU ARE A MISCHIEVIOUS LITTLE ELF for(var/g in avg_gas) gas[g] = max(0, (gas[g] - avg_gas[g]) * (1 - ratio) + avg_gas[g]) From c26c22c9d2d770e279375a762a2c039d3ecf1f04 Mon Sep 17 00:00:00 2001 From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com> Date: Sat, 25 Feb 2023 18:17:08 +1000 Subject: [PATCH 02/17] Update flash.dm --- code/game/objects/items/devices/flash.dm | 7 ------- 1 file changed, 7 deletions(-) diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm index 607ceee7836..c8b823c6baf 100644 --- a/code/game/objects/items/devices/flash.dm +++ b/code/game/objects/items/devices/flash.dm @@ -1,13 +1,6 @@ /obj/item/device/flash name = "flash" -<<<<<<< HEAD - desc = "Used for blinding and being an asshole." -======= desc = "Used to blind and disorient." - icon = 'icons/obj/device.dmi' - pickup_sound = 'sound/items/pickup/device.ogg' - drop_sound = 'sound/items/drop/device.ogg' ->>>>>>> 69ba99b5e6e... /tg/ era language pass (#8962) icon_state = "flash" item_state = "flashtool" throwforce = 5 From a236ff66ea5198d645852c37d227f2fc1133993d Mon Sep 17 00:00:00 2001 From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com> Date: Mon, 13 Mar 2023 14:59:53 +1000 Subject: [PATCH 03/17] Update flash.dm --- code/game/objects/items/devices/flash.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm index c8b823c6baf..0b987e04c7f 100644 --- a/code/game/objects/items/devices/flash.dm +++ b/code/game/objects/items/devices/flash.dm @@ -1,6 +1,6 @@ /obj/item/device/flash name = "flash" - desc = "Used to blind and disorient." + desc = "Used for blinding and disorienting." icon_state = "flash" item_state = "flashtool" throwforce = 5 From aec41a05f5b4a6ce1b84e91266ed511948e10a71 Mon Sep 17 00:00:00 2001 From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com> Date: Mon, 13 Mar 2023 15:01:24 +1000 Subject: [PATCH 04/17] Update trash.dm --- code/game/objects/items/trash.dm | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm index 3230eee1090..7e5f8fd0798 100644 --- a/code/game/objects/items/trash.dm +++ b/code/game/objects/items/trash.dm @@ -249,15 +249,12 @@ drop_sound = 'sound/items/drop/soda.ogg' pickup_sound = 'sound/items/pickup/soda.ogg' -<<<<<<< HEAD /obj/item/trash/tomato name = "empty tomato soup can" icon_state = "tomato" drop_sound = 'sound/items/drop/soda.ogg' pickup_sound = 'sound/items/pickup/soda.ogg' -======= ->>>>>>> 69ba99b5e6e... /tg/ era language pass (#8962) /obj/item/trash/spinach name = "empty spinach can" icon_state = "spinach" @@ -353,11 +350,7 @@ drop_sound = 'sound/items/drop/soda.ogg' pickup_sound = 'sound/items/pickup/soda.ogg' -<<<<<<< HEAD -/obj/item/trash/spacercake_wrap -======= /obj/item/trash/spacer_cake_wrap ->>>>>>> 69ba99b5e6e... /tg/ era language pass (#8962) name = "snack cake wrapper" icon_state = "spacercake_wrap" @@ -423,7 +416,10 @@ name = "burrito packaging" icon_state = "smolburrito" -<<<<<<< HEAD +/obj/item/trash/candybowl + name = "candy bowl" + icon_state = "candy_bowl" + /obj/item/trash/brainzsnax name = "\improper BrainzSnax can" icon_state = "brainzsnax" @@ -435,8 +431,3 @@ icon_state = "brainzsnaxred" drop_sound = 'sound/items/drop/soda.ogg' pickup_sound = 'sound/items/pickup/soda.ogg' -======= -/obj/item/trash/candybowl - name = "candy bowl" - icon_state = "candy_bowl" ->>>>>>> 69ba99b5e6e... /tg/ era language pass (#8962) From d2bc2ce1b0bccf74fa14684248fd7b9766dd85fb Mon Sep 17 00:00:00 2001 From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com> Date: Mon, 13 Mar 2023 15:02:29 +1000 Subject: [PATCH 05/17] Update AI_modules.dm --- code/game/objects/items/weapons/AI_modules.dm | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/code/game/objects/items/weapons/AI_modules.dm b/code/game/objects/items/weapons/AI_modules.dm index 95570cc16ca..3d8baab284d 100644 --- a/code/game/objects/items/weapons/AI_modules.dm +++ b/code/game/objects/items/weapons/AI_modules.dm @@ -372,7 +372,7 @@ AI MODULES return 0 ..() -/obj/item/weapon/aiModule/syndicate // Slightly more dynamic freeform module -- TLE +/obj/item/weapon/aiModule/icate // Slightly more dynamic freeform module -- TLE name = "hacked AI module" var/newFreeFormLaw = "" desc = "A hacked AI law module: ''" @@ -427,17 +427,11 @@ AI MODULES origin_tech = list(TECH_DATA = 3, TECH_ILLEGAL = 1) laws = new/datum/ai_laws/nanotrasen_aggressive() -/******************** Syndicate Directives ********************/ +/******************** Mercenary Directives ********************/ -<<<<<<< HEAD /obj/item/weapon/aiModule/syndicate_override - name = "\improper 'Syndicate Directives' core AI module" - desc = "A 'Syndicate Directives' Core AI Module: 'Reconfigures the AI's core laws.'" -======= -/obj/item/aiModule/syndicate_override name = "\improper 'Mercenary Directives' core AI module" desc = "A 'Mercenary Directives' Core AI Module: 'Reconfigures the AI's core laws.'" ->>>>>>> 69ba99b5e6e... /tg/ era language pass (#8962) origin_tech = list(TECH_DATA = 4, TECH_ILLEGAL = 4) laws = new/datum/ai_laws/syndicate_override() From 446cd0e3622fb5127b43380ea448a5bf7c5263c6 Mon Sep 17 00:00:00 2001 From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com> Date: Mon, 13 Mar 2023 15:02:48 +1000 Subject: [PATCH 06/17] Update AI_modules.dm --- code/game/objects/items/weapons/AI_modules.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/AI_modules.dm b/code/game/objects/items/weapons/AI_modules.dm index 3d8baab284d..72c0c1915cb 100644 --- a/code/game/objects/items/weapons/AI_modules.dm +++ b/code/game/objects/items/weapons/AI_modules.dm @@ -372,7 +372,7 @@ AI MODULES return 0 ..() -/obj/item/weapon/aiModule/icate // Slightly more dynamic freeform module -- TLE +/obj/item/weapon/aiModule/syndicate // Slightly more dynamic freeform module -- TLE name = "hacked AI module" var/newFreeFormLaw = "" desc = "A hacked AI law module: ''" From 78ef01705224a8f9dae903cbe3d2baff9d14531b Mon Sep 17 00:00:00 2001 From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com> Date: Mon, 13 Mar 2023 15:03:13 +1000 Subject: [PATCH 07/17] Update chewables.dm --- code/game/objects/items/weapons/chewables.dm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/code/game/objects/items/weapons/chewables.dm b/code/game/objects/items/weapons/chewables.dm index 572ae2a68c3..caf5ae74c38 100644 --- a/code/game/objects/items/weapons/chewables.dm +++ b/code/game/objects/items/weapons/chewables.dm @@ -267,11 +267,7 @@ color = reagents.get_color() update_icon() -<<<<<<< HEAD -/obj/item/weapon/storage/box/pocky //ADDITION 04/17/2021 -======= -/obj/item/storage/box/pocky ->>>>>>> 69ba99b5e6e... /tg/ era language pass (#8962) +/obj/item/weapon/storage/box/pocky name = "\improper Totemo yoi Pocky" desc = "A bundle of chocolate-coated bisquit sticks." icon = 'icons/obj/food_snacks.dmi' From cd72de592a081425599944f46c08bd5bf957ffde Mon Sep 17 00:00:00 2001 From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com> Date: Mon, 13 Mar 2023 15:03:55 +1000 Subject: [PATCH 08/17] Update syndicate_ids.dm --- code/game/objects/items/weapons/id cards/syndicate_ids.dm | 8 -------- 1 file changed, 8 deletions(-) diff --git a/code/game/objects/items/weapons/id cards/syndicate_ids.dm b/code/game/objects/items/weapons/id cards/syndicate_ids.dm index 6a8c574719a..727d76fd260 100644 --- a/code/game/objects/items/weapons/id cards/syndicate_ids.dm +++ b/code/game/objects/items/weapons/id cards/syndicate_ids.dm @@ -87,18 +87,10 @@ /datum/card_state/dd_SortValue() return name -<<<<<<< HEAD /obj/item/weapon/card/id/syndicate_command - name = "syndicate ID card" - desc = "An ID straight from the Syndicate." - registered_name = "Syndicate" - assignment = "Syndicate Commander" -======= -/obj/item/card/id/syndicate_command name = "operative ID card" desc = "An ID straight from a mercenary organisation." registered_name = "Operative" assignment = "Operative Commander" ->>>>>>> 69ba99b5e6e... /tg/ era language pass (#8962) icon_state = "syndicate-id" access = list(access_syndicate, access_external_airlocks) From 7a5c03bb655353a3dcad279ec862848c3c62551a Mon Sep 17 00:00:00 2001 From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com> Date: Mon, 13 Mar 2023 15:04:26 +1000 Subject: [PATCH 09/17] Update toolbox.dm --- code/game/objects/items/weapons/storage/toolbox.dm | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/code/game/objects/items/weapons/storage/toolbox.dm b/code/game/objects/items/weapons/storage/toolbox.dm index 1696aa5dd35..9c6795aa123 100644 --- a/code/game/objects/items/weapons/storage/toolbox.dm +++ b/code/game/objects/items/weapons/storage/toolbox.dm @@ -3,13 +3,8 @@ */ /obj/item/weapon/storage/toolbox name = "toolbox" -<<<<<<< HEAD - desc = "Danger. Very robust." - icon = 'icons/obj/storage_vr.dmi' -======= desc = "A metal toolbox with remarkably robust construction." - icon = 'icons/obj/storage.dmi' ->>>>>>> 69ba99b5e6e... /tg/ era language pass (#8962) + icon = 'icons/obj/storage_vr.dmi' icon_state = "red" item_state_slots = list(slot_r_hand_str = "toolbox_red", slot_l_hand_str = "toolbox_red") center_of_mass = list("x" = 16,"y" = 11) From e7ebe8c0bd4c568a04debcdbc29c8eddbc9bd023 Mon Sep 17 00:00:00 2001 From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com> Date: Mon, 13 Mar 2023 15:05:39 +1000 Subject: [PATCH 10/17] Update signs.dm --- code/game/objects/structures/signs.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm index fee2fc6a927..abed996dd8d 100644 --- a/code/game/objects/structures/signs.dm +++ b/code/game/objects/structures/signs.dm @@ -256,12 +256,12 @@ /obj/structure/sign/redcross name = "medbay" - desc = "An international symbol of medical institutions. You'll probably get help here." + desc = "An interstellar symbol of medical institutions. You'll probably get help here." icon_state = "bluecross" /obj/structure/sign/greencross name = "medbay" - desc = "An international symbol of medical institutions. You'll probably get help here." + desc = "An interstellar symbol of medical institutions. You'll probably get help here." icon_state = "bluecross2" /obj/structure/sign/goldenplaque From 6eac63344b36bb73567beacc313b40b75c9dfdb7 Mon Sep 17 00:00:00 2001 From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com> Date: Mon, 13 Mar 2023 15:06:36 +1000 Subject: [PATCH 11/17] Update flooring.dm --- code/game/turfs/flooring/flooring.dm | 5 ----- 1 file changed, 5 deletions(-) diff --git a/code/game/turfs/flooring/flooring.dm b/code/game/turfs/flooring/flooring.dm index 5c7e45871ce..1b58490012c 100644 --- a/code/game/turfs/flooring/flooring.dm +++ b/code/game/turfs/flooring/flooring.dm @@ -619,7 +619,6 @@ var/list/flooring_types desc = "A flat area of poured concrete flooring." icon = 'icons/turf/concrete.dmi' icon_base = "concrete" -<<<<<<< HEAD is_plating = FALSE //VOREStation edit. It's a lot cooler if it's actual tile. can_paint = 1 //VOREStation edit. Let's allow for some fun. can_engrave = 1 //VOREStation edit. Fun. @@ -635,7 +634,3 @@ var/list/flooring_types /decl/flooring/grass/seasonal_grass/dark name = "grass" icon_base = "darkgrass" -======= - is_plating = TRUE - plating_type = /decl/flooring/concrete ->>>>>>> 69ba99b5e6e... /tg/ era language pass (#8962) From e3dcf6aed144cd1166b70baeccf7d35eef3d28d7 Mon Sep 17 00:00:00 2001 From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com> Date: Mon, 13 Mar 2023 15:07:27 +1000 Subject: [PATCH 12/17] Update miscellaneous.dm --- code/modules/clothing/suits/miscellaneous.dm | 5 ----- 1 file changed, 5 deletions(-) diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 7fa89ef692b..8cd3baaf52b 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -159,12 +159,7 @@ /obj/item/clothing/suit/syndicatefake name = "red space suit replica" icon_state = "syndicate" -<<<<<<< HEAD - desc = "A plastic replica of the syndicate space suit, you'll look just like a real murderous syndicate agent in this! This is a toy, it is not made for use in space!" -======= - default_worn_icon = 'icons/mob/spacesuit.dmi' desc = "A plastic replica of a mercenary combat space suit, you'll look just like a real bloodthirsty mercenary in this! This is a toy, it is not made for use in space!" ->>>>>>> 69ba99b5e6e... /tg/ era language pass (#8962) w_class = ITEMSIZE_NORMAL allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency/oxygen,/obj/item/toy) flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL|HIDETIE|HIDEHOLSTER From 9e4d056d726bacd4c641a9010f2266b150616bc9 Mon Sep 17 00:00:00 2001 From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com> Date: Mon, 13 Mar 2023 15:08:32 +1000 Subject: [PATCH 13/17] Update vending_machines.dm --- code/modules/economy/vending_machines.dm | 6 ------ 1 file changed, 6 deletions(-) diff --git a/code/modules/economy/vending_machines.dm b/code/modules/economy/vending_machines.dm index d43f096682f..a1375bfca67 100644 --- a/code/modules/economy/vending_machines.dm +++ b/code/modules/economy/vending_machines.dm @@ -1074,7 +1074,6 @@ desc = "An old sweet water vending machine, how did this end up here?" icon_state = "sovietsoda" product_ads = "For Tsar and Country.;Have you fulfilled your nutrition quota today?;Very nice!;We are simple people, for this is all we eat.;If there is a person, there is a problem. If there is no person, then there is no problem." -<<<<<<< HEAD products = list(/obj/item/weapon/reagent_containers/food/drinks/cans/boda = 30, /obj/item/weapon/reagent_containers/food/drinks/cans/redarmy = 15, /obj/item/weapon/reagent_containers/food/drinks/cans/arstbru = 15, @@ -1082,11 +1081,6 @@ /obj/item/weapon/reagent_containers/food/drinks/cans/kompot = 15) contraband = list(/obj/item/weapon/reagent_containers/food/drinks/cans/kvass = 10, /obj/item/weapon/reagent_containers/food/drinks/cans/bodaplus = 10) -======= - products = list(/obj/item/reagent_containers/food/drinks/cans/boda = 30, - /obj/item/reagent_containers/food/drinks/cans/kompot = 20) - contraband = list(/obj/item/reagent_containers/food/drinks/cans/kvass = 20) ->>>>>>> 69ba99b5e6e... /tg/ era language pass (#8962) idle_power_usage = 211 //refrigerator - believe it or not, this is actually the average power consumption of a refrigerated vending machine according to NRCan. vending_sound = "machines/vending/vending_cans.ogg" From 37fe448b526995902deab89f459209816cb6be62 Mon Sep 17 00:00:00 2001 From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com> Date: Mon, 13 Mar 2023 15:10:05 +1000 Subject: [PATCH 14/17] Update snacks.dm --- code/modules/food/food/snacks.dm | 647 +------------------------------ 1 file changed, 2 insertions(+), 645 deletions(-) diff --git a/code/modules/food/food/snacks.dm b/code/modules/food/food/snacks.dm index 01bdad4ccb3..8430adfb299 100644 --- a/code/modules/food/food/snacks.dm +++ b/code/modules/food/food/snacks.dm @@ -6607,11 +6607,7 @@ .=..() reagents.add_reagent("capsaicin", 5) -<<<<<<< HEAD -/obj/item/weapon/reagent_containers/food/snacks/sun_snax //ADDITION 04/14/2021 -======= -/obj/item/reagent_containers/food/snacks/sun_snax ->>>>>>> 69ba99b5e6e... /tg/ era language pass (#8962) +/obj/item/weapon/reagent_containers/food/snacks/sun_snax name = "\improper Sun Snax!" icon = 'icons/obj/food_snacks.dmi' icon_state = "sun_snax" @@ -6711,11 +6707,7 @@ .=..() reagents.add_reagent("capsaicin",1) -<<<<<<< HEAD -/obj/item/weapon/reagent_containers/food/snacks/wasabi_peas //ADDITION 04/14/2021 -======= -/obj/item/reagent_containers/food/snacks/wasabi_peas ->>>>>>> 69ba99b5e6e... /tg/ era language pass (#8962) +/obj/item/weapon/reagent_containers/food/snacks/wasabi_peas name = "\improper Hadokikku Peas" icon = 'icons/obj/food_snacks.dmi' icon_state = "wasabi_peas" @@ -7155,638 +7147,3 @@ /obj/item/weapon/reagent_containers/food/snacks/packaged/vendburrito/Initialize() . = ..() reagents.add_reagent("sodiumchloride", 1) -<<<<<<< HEAD -======= - -//Virgo Stuff - -/obj/item/reagent_containers/food/snacks/sliceable/sushi - name = "sushi roll" - desc = "A whole sushi roll! Slice it up and enjoy with some soy sauce and wasabi." - icon = 'icons/obj/food_syn.dmi' - icon_state = "sushi" - slice_path = /obj/item/reagent_containers/food/snacks/slice/sushi/filled - slices_num = 5 - bitesize = 5 - nutriment_desc = list("rice" = 5, "fish" = 5) - nutriment_amt = 15 - -/obj/item/reagent_containers/food/snacks/sliceable/sushi/Initialize() - . = ..() - reagents.add_reagent("protein", 10) - -/obj/item/reagent_containers/food/snacks/slice/sushi/filled - name = "piece of sushi" - desc = "A slice of a larger sushi roll, ready to devour." - icon = 'icons/obj/food_syn.dmi' - icon_state = "sushi_s" - bitesize = 5 - whole_path = /obj/item/reagent_containers/food/snacks/sliceable/sushi - -/obj/item/reagent_containers/food/snacks/slice/sushi/filled/filled - filled = TRUE - -/obj/item/reagent_containers/food/snacks/goulash - name = "goulash" - desc = "Hope you're Hungary!" - icon = 'icons/obj/food_syn.dmi' - icon_state = "goulash" - trash = /obj/item/trash/snack_bowl - nutriment_amt = 6 - nutriment_desc = list("meat" = 2, "vegetables" = 2, "seasoning" = 5) - -/obj/item/reagent_containers/food/snacks/goulash/Initialize() - . = ..() - reagents.add_reagent("protein", 3) //For meaty things. - reagents.add_reagent("water", 5) - - -/obj/item/reagent_containers/food/snacks/donerkebab - name = "doner kebab" - desc = "Traditional food of the very drunk. The meat is typically cooked on a vertical rotisserie." - icon = 'icons/obj/food_syn.dmi' - icon_state = "doner_kebab" - nutriment_amt = 5 - nutriment_desc = list("vegetables" = 2, "seasoned meat" = 5) - -/obj/item/reagent_containers/food/snacks/donerkebab/Initialize() - . = ..() - reagents.add_reagent("protein", 2) //For meaty things. - - -/obj/item/reagent_containers/food/snacks/roastbeef - name = "roast beef" - desc = "It's beef. It's roasted. It's been a staple of dining tradition for centuries." - icon = 'icons/obj/food_syn.dmi' - icon_state = "roastbeef" - trash = /obj/item/trash/plate - bitesize = 2 - nutriment_amt = 8 - nutriment_desc = list("cooked meat" = 5) - -/obj/item/reagent_containers/food/snacks/roastbeef/Initialize() - . = ..() - reagents.add_reagent("protein", 4) //For meaty things. - - -/obj/item/reagent_containers/food/snacks/reishicup - name = "reishi's cup" - desc = "A chocolate treat with an odd flavor." - icon = 'icons/obj/food_syn.dmi' - icon_state = "reishiscup" - bitesize = 6 - nutriment_amt = 3 - nutriment_desc = list("chocolate" = 4, "colors" = 2) - -/obj/item/reagent_containers/food/snacks/reishicup/Initialize() - . = ..() - reagents.add_reagent("psilocybin", 3) - -/obj/item/storage/box/wings //This is kinda like the donut box. - name = "wing basket" - desc = "A basket of chicken wings! Get some before they're all gone! Or maybe you're too late..." - icon = 'icons/obj/food_syn.dmi' - icon_state = "wings5" - var/icon_base = "wings" - var/startswith = 5 - max_storage_space = ITEMSIZE_COST_SMALL * 5 - can_hold = list(/obj/item/reagent_containers/food/snacks/chickenwing) - starts_with = list( - /obj/item/reagent_containers/food/snacks/chickenwing = 5 - ) - foldable = null - -/obj/item/storage/box/wings/Initialize() - . = ..() - update_icon() - return - -/obj/item/storage/box/wings/update_icon() - var/i = 0 - for(var/obj/item/reagent_containers/food/snacks/W in contents) - i++ - icon_state = "[icon_base][i]" - -/obj/item/reagent_containers/food/snacks/chickenwing - name = "chicken wing" - desc = "What flavor even is this? Buffalo? Barbecue? Or something more exotic?" - icon = 'icons/obj/food_syn.dmi' - icon_state = "wing" - bitesize = 3 - nutriment_amt = 2 - nutriment_desc = list("chicken" = 2, "unplacable flavor sauce" = 4) - -/obj/item/reagent_containers/food/snacks/chickenwing/Initialize() - . = ..() - reagents.add_reagent("protein", 1) - -/obj/item/reagent_containers/food/snacks/hotandsoursoup - name = "hot & sour soup" - desc = "A soup both spicy and sour from ancient Chinese cooking traditions. This one is made with tofu." - icon = 'icons/obj/food_syn.dmi' - icon_state = "hotandsoursoup" - trash = /obj/item/trash/asian_bowl - bitesize = 2 - nutriment_amt = 6 - nutriment_desc = list("spicyness" = 4, "sourness" = 4, "tofu" = 1) - -/obj/item/reagent_containers/food/snacks/hotandsoursoup/Initialize() - . = ..() - - -/obj/item/reagent_containers/food/snacks/kitsuneudon - name = "kitsune udon" - desc = "A purported favorite of kitsunes in ancient japanese myth: udon noodles, fried egg, and tofu." - icon = 'icons/obj/food_syn.dmi' - icon_state = "kitsuneudon" - trash = /obj/item/trash/asian_bowl - bitesize = 2 - nutriment_amt = 6 - nutriment_desc = list("fried egg" = 2, "egg noodles" = 4) - -/obj/item/reagent_containers/food/snacks/kitsuneudon/Initialize() - . = ..() - -/obj/item/reagent_containers/food/snacks/generalschicken - name = "general's chicken" - desc = "Sweet, spicy, and fried. General's Chicken has been around for more than five-hundred years now, and still tastes good." - icon = 'icons/obj/food_syn.dmi' - icon_state = "generaltso" - trash = /obj/item/trash/asian_bowl - bitesize = 2 - nutriment_amt = 6 - nutriment_desc = list("sweet and spicy sauce" = 5, "chicken" = 3) - -/obj/item/reagent_containers/food/snacks/generalschicken/Initialize() - . = ..() - reagents.add_reagent("protein", 4) - -/obj/item/reagent_containers/food/snacks/mammi - name = "mämmi" - desc = "Traditional finnish desert, some like it, others don't. It's drifting in some milk, add sugar!" - icon = 'icons/obj/food_syn.dmi' - icon_state = "mammi" - trash = /obj/item/trash/plate - bitesize = 3 - nutriment_amt = 3 - nutriment_desc = list("brothy sweet goodness" = 5) - -/obj/item/reagent_containers/food/snacks/mammi/Initialize() - . = ..() - -/obj/item/reagent_containers/food/snacks/lobster - name = "raw lobster" - desc = "A shifty lobster. You can try eating it, but its shell is extremely tough." - icon = 'icons/obj/food_syn.dmi' - bitesize = 0.1 - icon_state = "lobster_raw" - nutriment_amt = 5 - -/obj/item/reagent_containers/food/snacks/lobstercooked - name = "cooked lobster" - desc = "A luxurious plate of cooked lobster, its taste accentuated by lemon juice. Reinvigorating!" - icon = 'icons/obj/food_syn.dmi' - icon_state = "lobster_cooked" - trash = /obj/item/trash/plate - nutriment_amt = 20 - bitesize = 5 - nutriment_desc = list("lemon" = 2, "lobster" = 5, "salad" = 2) - -/obj/item/reagent_containers/food/snacks/lobstercooked/Initialize() - . = ..() - reagents.add_reagent("protein", 20) - reagents.add_reagent("tricordrazine", 5) - reagents.add_reagent("iron", 5) - -/obj/item/reagent_containers/food/snacks/cuttlefish - name = "raw cuttlefish" - desc = "It's an adorable squid! You couldn't possibly be thinking about eating this, right?" - icon = 'icons/obj/food_syn.dmi' - icon_state = "cuttlefish_raw" - bitesize = 10 - nutriment_amt = 5 - -/obj/item/reagent_containers/food/snacks/cuttlefishcooked - name = "cooked cuttlefish" - desc = "It's a roasted cuttlefish. Rubbery, squishy, an acquired taste." - icon = 'icons/obj/food_syn.dmi' - icon_state = "cuttlefish_cooked" - bitesize = 5 - nutriment_amt = 20 - nutriment_desc = list("cuttlefish" = 5, "rubber" = 5, "grease" = 1) - -/obj/item/reagent_containers/food/snacks/cuttlefishcooked/Initialize() - . = ..() - reagents.add_reagent("protein", 10) - -/obj/item/reagent_containers/food/snacks/sliceable/monkfish - name = "extra large monkfish" - desc = "It's a huge monkfish. Better clean it first, you can't possibly eat it like this." - icon = 'icons/obj/food48x48.dmi' - icon_state = "monkfish_raw" - bitesize = 2 - nutriment_amt = 30 - w_class = ITEMSIZE_HUGE //Is that a monkfish in your pocket, or are you just happy to see me? - slice_path = /obj/item/reagent_containers/food/snacks/monkfishfillet - slices_num = 6 - trash = /obj/item/reagent_containers/food/snacks/sliceable/monkfishremains - -/obj/item/reagent_containers/food/snacks/sliceable/monkfish/Initialize() - . = ..() - -/obj/item/reagent_containers/food/snacks/monkfishfillet - name = "monkfish fillet" - desc = "It's a fillet sliced from a monkfish." - icon = 'icons/obj/food_syn.dmi' - icon_state = "monkfish_fillet" - bitesize = 3 - nutriment_amt = 5 - -/obj/item/reagent_containers/food/snacks/monkfishfillet/Initialize() - . = ..() - reagents.add_reagent("protein", 1) - -/obj/item/reagent_containers/food/snacks/monkfishcooked - name = "seasoned monkfish" - desc = "A delicious slice of monkfish prepared with sweet chili and spring onion." - icon = 'icons/obj/food_syn.dmi' - icon_state = "monkfish_cooked" - bitesize = 4 - nutriment_amt = 10 - nutriment_desc = list("fish" = 3, "oil" = 1, "sweet chili" = 3, "spring onion" = 2) - -/obj/item/reagent_containers/food/snacks/monkfishcooked/Initialize() - . = ..() - reagents.add_reagent("protein", 5) - -/obj/item/reagent_containers/food/snacks/sliceable/monkfishremains - name = "monkfish remains" - icon = 'icons/obj/food_syn.dmi' - icon_state = "monkfish_remains" - desc = "The work of a madman." - w_class = ITEMSIZE_LARGE - bitesize = 0.01 //impossible to eat - nutriment_amt = 10 - slice_path = /obj/item/clothing/head/fish - slices_num = 1 - -/obj/item/reagent_containers/food/snacks/sliceable/monkfishremains/Initialize() - . = ..() - reagents.add_reagent("carbon", 5) - -/obj/item/reagent_containers/food/snacks/sliceable/sharkchunk - name = "chunk of shark meat" - desc = "Still rough, needs to be cut into even smaller chunks." - icon = 'icons/obj/food_syn.dmi' - icon_state = "sharkmeat_chunk" - bitesize = 3 - nutriment_amt = 15 - w_class = ITEMSIZE_LARGE - slice_path = /obj/item/reagent_containers/food/snacks/carpmeat/fish/sharkmeat - slices_num = 5 - -/obj/item/reagent_containers/food/snacks/sliceable/sharkchunk/Initialize() - . = ..() - reagents.add_reagent("protein", 20) - -/obj/item/reagent_containers/food/snacks/carpmeat/fish/sharkmeat - name = "slice of sharkmeat" - desc = "Now it's small enough to cook with." - icon = 'icons/obj/food_syn.dmi' - icon_state = "sharkmeat" - bitesize = 3 - nutriment_amt = 2 - toxin_amount = null - -/obj/item/reagent_containers/food/snacks/carpmeat/fish/sharkmeat/Initialize() - . = ..() - reagents.add_reagent("protein", 2) - -/obj/item/reagent_containers/food/snacks/sharkmeatcooked - name = "shark steak" - desc = "Finally, some food for real men." - icon = 'icons/obj/food_syn.dmi' - icon_state = "sharkmeat_cooked" - trash = /obj/item/trash/small_bowl - bitesize = 3 - nutriment_amt = 5 - trash = /obj/item/trash/plate - nutriment_desc = list("manliness" = 1, "fish oil" = 2, "shark" = 2) - -/obj/item/reagent_containers/food/snacks/sharkmeatcooked/Initialize() - . = ..() - reagents.add_reagent("protein", 8) - -/obj/item/reagent_containers/food/snacks/sharkmeatdip - name = "hot shark shank" - desc = "A shank of shark meat dipped in hot sauce." - icon = 'icons/obj/food_syn.dmi' - icon_state = "sharkmeat_dip" - bitesize = 3 - nutriment_amt = 5 - trash = /obj/item/trash/snack_bowl - nutriment_desc = list("salt" = 1, "fish oil" = 2, "spicy shark" = 2) - -/obj/item/reagent_containers/food/snacks/sharkmeatdip/Initialize() - . = ..() - reagents.add_reagent("capsaicin", 4) - reagents.add_reagent("protein", 4) - -/obj/item/reagent_containers/food/snacks/sharkmeatcubes - name = "shark cubes" - desc = "Foul scented fermented shark cubes, it's said to make men fly, or just make them really fat." - icon = 'icons/obj/food_syn.dmi' - icon_state = "sharkmeat_cubes" - bitesize = 10 - nutriment_amt = 8 - trash = /obj/item/trash/plate - nutriment_desc = list("viking spirit" = 1, "rot" = 2, "fermented sauce" = 2) - -/obj/item/reagent_containers/food/snacks/sharkmeatcubes/Initialize() - . = ..() - reagents.add_reagent("potatojuice", 30) // for people who want to get fat, FAST. - -/obj/item/reagent_containers/food/snacks/dynsoup - name = "dyn soup" - desc = "An imported skrellian recipe, with certain substitions for ingredients not commonly available outside of Skrellian space." - icon = 'icons/obj/food_syn.dmi' - icon_state = "dynsoup" - bitesize = 5 - nutriment_amt = 8 - nutriment_desc = list("peppermint" = 2, "salad" = 4, "hot stew" = 2) - -/obj/item/reagent_containers/food/snacks/dynsoup/Initialize() - . = ..() - reagents.add_reagent("water", 5) - reagents.add_reagent("dynjuice", 4) - reagents.add_reagent("tomatojuice", 4) - -/obj/item/reagent_containers/food/snacks/zantiri - name = "zantiri" - desc = "A soupy mush comprised of guami and eki, two plants native to Qerr'balak. In a bowl, it looks not unlike staring into a starry sky." - icon = 'icons/obj/food_syn.dmi' - icon_state = "zantiri" - bitesize = 5 - nutriment_amt = 9 - nutriment_desc = list("inky mush" = 5, "crunchy lichen" = 4) - -/obj/item/reagent_containers/food/snacks/zantiri/Initialize() - . = ..() - reagents.add_reagent("water", 6) - reagents.add_reagent("nutriment", 8) - -/obj/item/reagent_containers/food/snacks/stew/neaera - name = "neaera stew" - desc = "Neaera meat stewed in a mixture of water and dyn juice, garnished with guami and eki. Often cooked in large batches to feed many teshari pack members." - icon = 'icons/obj/food_syn.dmi' - icon_state = "neaera_stew" - filling_color = "#7C66DD" - nutriment_desc = list("meaty mushroom" = 6, "crunchy lichen" = 6, "peppermint" = 6) - -/obj/item/reagent_containers/food/snacks/stew/neaera/Initialize() - . = ..() - reagents.add_reagent("nutriment", 4) - reagents.add_reagent("seafood", 6) - reagents.add_reagent("dynjuice", 4) - -/obj/item/reagent_containers/food/snacks/chipplate/neaeracandy - name = "plate of candied neaera eyes" - desc = "Candied neaera eyes shaped into cubes. The mix of savoury and sweet is generally acceptable for most species, although many dislike the dish for its use of eyes." - icon_state = "neaera_candied_eyes20" - trash = /obj/item/trash/candybowl - vendingobject = /obj/item/reagent_containers/food/snacks/neaeracandy - nutriment_desc = list("creamy, fatty meat" = 20) - bitesize = 1 - unitname = "eye" - nutriment_amt = 20 - filling_color = "#7C66DD" - -/obj/item/reagent_containers/food/snacks/chipplate/neaeracandy/Initialize() - . = ..() - reagents.add_reagent("seafood", 20) - -/obj/item/reagent_containers/food/snacks/chipplate/neaeracandy/update_icon() - switch(reagents.total_volume) - if(1) - icon_state = "neaera_candied_eyes1" - if(2 to 5) - icon_state = "neaera_candied_eyes5" - if(6 to 10) - icon_state = "neaera_candied_eyes10" - if(11 to 15) - icon_state = "neaera_candied_eyes15" - if(20 to INFINITY) - icon_state = "neaera_candied_eyes20" - -/obj/item/reagent_containers/food/snacks/neaeracandy - name = "candied neaera eye" - desc = "A candied neaera eye shaped into a cube. The mix of savoury and sweet is generally acceptable for most species, although many dislike the dish for its use of eyes." - icon = 'icons/obj/food_syn.dmi' - icon_state = "neaera_candied_eye" - nutriment_desc = list("creamy, fatty meat" = 3) - bitesize = 2 - nutriment_amt = 3 - filling_color = "#7C66DD" - -/obj/item/reagent_containers/food/snacks/neaeracandy/Initialize() - . = ..() - reagents.add_reagent("seafood", 3) - -/obj/item/reagent_containers/food/snacks/neaerakabob - name = "neaera-kabob" - desc = "Neaera meat and giblets that have been cooked on a skewer." - icon = 'icons/obj/food_syn.dmi' - icon_state = "neaera_skewer" - trash = /obj/item/stack/rods - filling_color = "#7C66DD" - center_of_mass = list("x"=17, "y"=15) - nutriment_desc = list("fatty meat" = 2) - nutriment_amt = 4 - bitesize = 2 - -/obj/item/reagent_containers/food/snacks/neaeracandy/Initialize() - . = ..() - reagents.add_reagent("seafood", 4) - -/obj/item/reagent_containers/food/snacks/lortl - name = "lortl" - desc = "Dehydrated and salted q'lort slices, a very common Skrellian snack." - icon = 'icons/obj/hydroponics_misc.dmi' - filling_color = "#B7D6BF" - bitesize = 2 - nutriment_amt = 2 - nutriment_desc = list("dried fruit" = 2) - -/obj/item/reagent_containers/food/snacks/lortl/Initialize() - . = ..() - reagents.add_reagent("sodiumchloride", 2) - if(!fruit_icon_cache["rind-#B1E4BE"]) - var/image/I = image(icon,"fruit_rind") - I.color = "#B1E4BE" - fruit_icon_cache["rind-#B1E4BE"] = I - add_overlay(fruit_icon_cache["rind-#B1E4BE"]) - if(!fruit_icon_cache["slice-#B1E4BE"]) - var/image/I = image(icon,"fruit_slice") - I.color = "#9FE4B0" - fruit_icon_cache["slice-#B1E4BE"] = I - add_overlay(fruit_icon_cache["slice-#B1E4BE"]) - -/obj/item/reagent_containers/food/snacks/qalozynboiled - name = "boiled qa'lozyn" - desc = "A Qerr'balakian vegetable. Poisonous raw, but rendered edible by boiling." - icon = 'icons/obj/food_syn.dmi' - icon_state = "qalozyn_boiled" - nutriment_amt = 4 - nutriment_desc = list("sweet turnips" = 4) - bitesize = 2 - filling_color = "#7C66DD" - -/obj/item/reagent_containers/food/snacks/garani - name = "garani" - icon = 'icons/obj/food_syn.dmi' - desc = "Neaera liver stuffed with boiled qa'lozyn and fried in oil. A popular light meal for teshari." - icon_state = "garani" - nutriment_amt = 8 - nutriment_desc = list("fatty meat" = 4, "sweet turnips" = 4) - bitesize = 3 - filling_color = "#7C66DD" - -/obj/item/reagent_containers/food/snacks/ganami/Initialize() - . = ..() - reagents.add_reagent("seafood", 4) - -/obj/item/reagent_containers/food/snacks/qazal_dough - name = "qa'zal dough" - icon = 'icons/obj/food_syn.dmi' - desc = "A coarse, stretchy, skrellian dough made from qa'zal flour and ga'uli juice in a striking purple color." - icon_state = "qazal_dough" - bitesize = 2 - nutriment_amt = 3 - nutriment_desc = list("minty dough" = 3) - filling_color = "#B97BD9" - -/obj/item/reagent_containers/food/snacks/qazal_dough/attackby(obj/item/W as obj, mob/user as mob) - if(istype(W,/obj/item/material/kitchen/rollingpin)) - new /obj/item/reagent_containers/food/snacks/sliceable/qazal_flatdough(src) - to_chat(user, "You flatten the dough.") - qdel(src) - -/obj/item/reagent_containers/food/snacks/sliceable/qazal_flatdough - name = "flattened qa'zal dough" - icon = 'icons/obj/food_syn.dmi' - desc = "A flattened, stretchy purple dough" - icon_state = "flat_qazal_dough" - bitesize = 2 - nutriment_amt = 3 - nutriment_desc = list("minty dough" = 3) - slice_path = /obj/item/reagent_containers/food/snacks/qazal_doughstrip - slices_num = 3 - filling_color = "#B97BD9" - -/obj/item/reagent_containers/food/snacks/qazal_doughstrip - name = "qa'zal dough strip" - icon = 'icons/obj/food_syn.dmi' - desc = "Thick-cut segments of qa'zal dough formed into what resembles a chewy, purple pasta." - icon_state = "qazal_pasta" - bitesize = 2 - nutriment_amt = 3 - nutriment_desc = list("minty pasta" = 1) - filling_color = "#B97BD9" - -/obj/item/reagent_containers/food/snacks/sliceable/qazal_bread - name = "qa'zal bread" - icon = 'icons/obj/food_syn.dmi' - desc = "A loaf of soft qa'zal bread in a striking dark purple color, ready to be cut into slices. It's surprisingly stretchy, and smells quite minty." - icon_state = "qazal_loaf" - nutriment_amt = 20 - slices_num = 5 - nutriment_desc = list("minty bread" = 5) - slice_path = /obj/item/reagent_containers/food/snacks/slice/qazal_bread_slice - filling_color = "#B97BD9" - -/obj/item/reagent_containers/food/snacks/slice/qazal_bread_slice - name = "qa'zal bread slice" - icon = 'icons/obj/food_syn.dmi' - desc = "A slice of stretchy qa'zal bread." - icon_state = "qazal_bread_slice" - whole_path = /obj/item/reagent_containers/food/snacks/sliceable/qazal_bread - nutriment_desc = list("minty bread" = 1) - filling_color = "#B97BD9" - -/obj/item/reagent_containers/food/snacks/slice/qazal_bread_slice/filled - filled = TRUE - -/obj/item/reagent_containers/food/snacks/grilled_qazal_flatbread - name = "grilled qa'zal flatbread" - desc = "Crispy, grilled qa'zal flatbread. No longer as stretchy, but it smells absolutely amazing." - icon = 'icons/obj/food_syn.dmi' - icon_state = "grilled_qazal_flatbread" - nutriment_amt = 8 - bitesize = 1 - nutriment_desc = list("minty flatbread" = 1) - filling_color = "#B97BD9" - -/obj/item/reagent_containers/food/snacks/baked_gauli - name = "baked ga'uli" - icon = 'icons/obj/food_syn.dmi' - desc = "A ga'uli pod baked in an oven, causing the minty liquid inside to condense and the exterior to soften, giving the vegetable a hard-boiled egg consistency. Remarkably tasty and healthy!" - icon_state = "baked_gauli" - nutriment_amt = 4 - nutriment_desc = list("zesty mintyness" = 1) - filling_color = "#B97BD9" - -/obj/item/reagent_containers/food/snacks/baked_kirani - name = "baked kirani" - icon = 'icons/obj/food_syn.dmi' - desc = "A kirani fruit baked in an oven, causing the jelly inside to caramelize into a jelly donut-like crispy treat." - icon_state = "baked_kirani" - nutriment_amt = 4 - nutriment_desc = list("crispy sweetness" = 2, "caramelized jelly" = 2) - filling_color = "#993C5C" - -/obj/item/reagent_containers/food/snacks/stuffed_gauli - name = "stuffed ga'uli pod" - desc = "A cooked ga'uli pod, stuffed with meat and minced kirani fruit." - icon = 'icons/obj/food_syn.dmi' - icon_state = "stuffed_gauli_pod" - nutriment_amt = 4 - bitesize = 1 - nutriment_desc = list("meat" = 1, "sweet kirani" = 1, "minty ga'uli" = 1) - -/obj/item/reagent_containers/food/snacks/stuffed_gauli/Initialize() - . = ..() - reagents.add_reagent("protein", 4, nutriment_desc) - -/obj/item/reagent_containers/food/snacks/kirani_stew - name = "kirani stew" - desc = "Meat mixed with finely sliced qa'zal, drizzled in kirani jelly sauce, just the perfect balance of savory and sweet." - icon = 'icons/obj/food_syn.dmi' - icon_state = "kirani_stew" - nutriment_amt = 8 - trash = /obj/item/trash/snack_bowl - bitesize = 1 - nutriment_desc = list("minty qa'zal" = 1, "sweet kirani jelly" = 1) - -/obj/item/reagent_containers/food/snacks/kirani_stew/Initialize() - . = ..() - reagents.add_reagent("protein", 4, nutriment_desc) - -/obj/item/reagent_containers/food/snacks/qazal_noodles - name = "qa'zal noodles" - desc = "Qa'zal pasta mixed in a bowl with chopped kirani fruit and gu'ali pods. It looks bizarre and seems kind of slimy, but the taste cannot be denied." - icon = 'icons/obj/food_syn.dmi' - icon_state = "qazal_noodles" - trash = /obj/item/trash/snack_bowl - nutriment_amt = 8 - bitesize = 1 - nutriment_desc = list("chewy qa'zal noodles" = 1, "minty gu'ali juice" = 1, "sweet kirani jelly" = 1) - -/obj/item/reagent_containers/food/snacks/kirani_jellypuff - name = "kirani jellypuff" - desc = "A piece of qa'zal bread containing a kirani jelly filling and sprinkled with qa'zal flour. Just one will never be enough." - icon = 'icons/obj/food_syn.dmi' - icon_state = "kirani_jellypuff" - nutriment_amt = 8 - bitesize = 2 - nutriment_desc = list("puffed minty qa'zal bread" = 1, "super-sweet kirani jelly" = 1) ->>>>>>> 69ba99b5e6e... /tg/ era language pass (#8962) From 6aecbcd4c29a6b38c7ca33b7dbe0cbc7ff92981a Mon Sep 17 00:00:00 2001 From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com> Date: Mon, 13 Mar 2023 15:11:06 +1000 Subject: [PATCH 15/17] Update reagent_tank.dm --- .../reagents/machinery/dispenser/reagent_tank.dm | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/code/modules/reagents/machinery/dispenser/reagent_tank.dm b/code/modules/reagents/machinery/dispenser/reagent_tank.dm index cf2d5570818..df1af4cfd85 100644 --- a/code/modules/reagents/machinery/dispenser/reagent_tank.dm +++ b/code/modules/reagents/machinery/dispenser/reagent_tank.dm @@ -492,17 +492,3 @@ reagents.splash_area(get_turf(src), 3) visible_message(span("danger", "The [src] bursts open, spreading oil all over the area.")) qdel(src) -<<<<<<< HEAD -======= - -/obj/structure/reagent_dispensers/he3 - name = "fueltank" - desc = "A fueltank." - icon = 'icons/obj/objects.dmi' - icon_state = "weldtank" - amount_per_transfer_from_this = 10 - -/obj/structure/reagent_dispensers/he3/Initialize() - . = ..() - reagents.add_reagent("helium3",1000) ->>>>>>> 69ba99b5e6e... /tg/ era language pass (#8962) From 043b99717fea350af85c3b74f808134d833af9e2 Mon Sep 17 00:00:00 2001 From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com> Date: Mon, 13 Mar 2023 15:12:15 +1000 Subject: [PATCH 16/17] Update food_drinks.dm --- code/modules/reagents/reagents/food_drinks.dm | 59 ------------------- 1 file changed, 59 deletions(-) diff --git a/code/modules/reagents/reagents/food_drinks.dm b/code/modules/reagents/reagents/food_drinks.dm index c1171b2b9c7..d26773ecb04 100644 --- a/code/modules/reagents/reagents/food_drinks.dm +++ b/code/modules/reagents/reagents/food_drinks.dm @@ -4537,62 +4537,3 @@ nutriment_factor = 2 glass_name = "kvass" glass_desc = "A hearty glass of Slavic brew." -<<<<<<< HEAD -======= - -//Querbalak stuff -/datum/reagent/drink/juice/dyn - name = "Dyn juice" - id = "dynjuice" - description = "Juice from a Qerr'balakian herb. Good for you, but usually diluted for potability." - taste_description = "astringent menthol" - color = "#00e0e0" - glass_name = "dyn juice" - glass_desc = "Juice from a Qerr'balakian herb. Good for you, but usually diluted for potability." - sugary = FALSE - -/datum/reagent/drink/tea/dyn - name = "Dyn tea" - id = "dynhot" - description = "A traditional skrellian drink with documented medicinal properties." - color = "#00e0e0" - taste_description = "peppermint water" - allergen_type = null //no caffine here - glass_name = "dyn tea" - glass_desc = "An old-fashioned, but traditional skrellian drink with documented medicinal properties." - cup_name = "cup of dyn tea" - cup_desc = "An old-fashioned, but traditional skrellian drink with documented medicinal properties." - -/datum/reagent/drink/tea/icetea/dyn - name = "Dyn iced tea" - id = "dyncold" - description = "A modern spin on an old formula. Good for you!" - color = "#00e0e0" - taste_description = "fizzy mint tea" - allergen_type = null - glass_name = "dyn iced tea" - glass_desc = "A modern spin on an old formula. Good for you!" - -/datum/reagent/nutriment/qazal_flour - name = "Qa'zal flour" - id = "qazal_flour" - description = "Harvested from ground qa'zal, this is one of the main ingredients in qa'zal bread." - taste_description = "chalky, sweet dryness" - reagent_state = SOLID - nutriment_factor = 1 - color = "#c499bc" - -/datum/reagent/nutriment/kirani_jelly - name = "Kirani jelly" - id = "kirani_jelly" - description = "Sticky, sweet jelly from ground kiriani fruits." - taste_description = "ultra-sweet jelly" - color = "#993c5c" - -/datum/reagent/drink/gauli_juice - name = "Ga'uli juice" - id = "gauli_juice" - description = "Juice from a ga'uli pod, used in skrellian and teshari cooking." - color = "#6f83a6" - taste_description = "mintyness" ->>>>>>> 69ba99b5e6e... /tg/ era language pass (#8962) From 7547f7c3ce95d14e3940eccd2adf357269e6458f Mon Sep 17 00:00:00 2001 From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com> Date: Mon, 13 Mar 2023 15:16:45 +1000 Subject: [PATCH 17/17] Update snacks.dm --- code/modules/food/food/snacks.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/food/food/snacks.dm b/code/modules/food/food/snacks.dm index 8430adfb299..8299902b617 100644 --- a/code/modules/food/food/snacks.dm +++ b/code/modules/food/food/snacks.dm @@ -7041,7 +7041,7 @@ description_fluff = "Despite Spacer advertisements consistently portraying their snack cakes as life-saving, \ tear-jerking survival food for spacers in all kinds of dramatic scenarios, the Spacer Snack Cake has been \ statistically proven to lower survival rates on all missions where it is present." - package_trash = /obj/item/trash/spacercake_wrap + package_trash = /obj/item/trash/spacer_cake_wrap package_open_state = "spacercake_open" filling_color = "#FFE591" center_of_mass = list("x"=15, "y"=11)