diff --git a/code/datums/ruins/lavaland.dm b/code/datums/ruins/lavaland.dm index 3e9c7f884eb..c6df37b26c7 100644 --- a/code/datums/ruins/lavaland.dm +++ b/code/datums/ruins/lavaland.dm @@ -299,11 +299,3 @@ suffix = "lavaland_surface_elephant_graveyard.dmm" allow_duplicates = FALSE cost = 10 - -/datum/map_template/ruin/lavaland/lavaland_errorcodehostile - name = "errorcode-hostile" - id = "errorcodehostile" - description = "Signal Lost- Error... Code-Hostile" - suffix = "lavaland_errorcodehostile.dmm" - allow_duplicates = FALSE - cost = 10 diff --git a/code/datums/ruins/space.dm b/code/datums/ruins/space.dm index 72c1bb44887..d8ca4041e8d 100644 --- a/code/datums/ruins/space.dm +++ b/code/datums/ruins/space.dm @@ -331,48 +331,6 @@ name = "Space Diner" description = "Come, traveler of the bluespace planes. Sit, enjoy a drink and take one of the fair maidens for a night. The exit is the way you came in, via that teleporter thingy, but do remember to stay safe." -/datum/map_template/ruin/space/syndie_minibase_spawn - id = "syndie_minibase_spawn" - suffix = "syndie_minibase_spawn.dmm" - name = "Syndicate Communications and Retrieval Base" - description = "The Syndicate have placed you within close proximity of your target, gather what information you can about the base. Get in, steal the Captains Antique Raygun and get out. May best of luck be on your side soldier." - -/datum/map_template/ruin/space/dcshuttle - id = "dcshuttle" - suffix = "dcshuttle.dmm" - name = "DefCorp Ship" - description = "Jer" - -/datum/map_template/ruin/space/spiderden - id = "spiderden" - suffix = "spiderden.dmm" - name = "Spider Den" - description = "They tell stories of the crucades that happened millenias past..." - -/datum/map_template/ruin/space/dcderelict - id = "dcderelict" - suffix = "dcderelict.dmm" - name = "DC Derelict" - description = "A satellite for the mysterious corporation known as DefCorp, appears to be a bit dated." - -/datum/map_template/ruin/space/spacepolice - id = "spacepolice" - suffix = "spacepolice.dmm" - name = "Space Police" - description = "Hired by CentCom to keep you safe!" - -/datum/map_template/ruin/space/madxenobiologist - id = "madxenobiologist" - suffix = "madxenobiologist.dmm" - name = "Xenobiology Prototype Ship" - description = "I will get my revenge..." - -/datum/map_template/ruin/space/ultimatespacegamer - id = "ultimatespacegamer" - suffix = "ultimatespacegamer.dmm" - name = "gamerdome" - description = "Who will come ontop!?" - allow_duplicates = TRUE /datum/map_template/ruin/space/suspicious id = "helterskelter" suffix = "skelter.dmm" diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm index 33e8982ca09..fa8a0bd239b 100644 --- a/code/game/objects/items/weaponry.dm +++ b/code/game/objects/items/weaponry.dm @@ -86,35 +86,6 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 force = 25 block_chance = 0 -/obj/item/claymore/unforgiven - name = "the unforgiven" - desc = "You feel betrayed, broken. Have they forgiven you? Will they forgive you!? Your mind spins with anger and confusion..." - hitsound = 'sound/weapons/sear.ogg' - force = 35 - throwforce = 15 - slot_flags = ITEM_SLOT_BACK - attack_verb = list("scorned", "carved", "seared", "sliced", "gashed", "glaved", "gutted") - block_chance = 30 - max_integrity = 500 - item_flags = SLOWS_WHILE_IN_HAND - -/obj/item/claymore/unforgiven/Initialize(mapload) - . = ..() - START_PROCESSING(SSobj, src) - AddComponent(/datum/component/butchering, 50, 105) - -/obj/item/claymore/unforgiven/Destroy() - STOP_PROCESSING(SSobj, src) - . = ..() - -/obj/item/claymore/unforgiven/process() - slowdown = -0.2 - if(iscarbon(loc)) - var/mob/living/carbon/wielder = loc - if(wielder.is_holding(src)) - wielder.update_equipment_speed_mods() - - /obj/item/claymore/highlander //ALL COMMENTS MADE REGARDING THIS SWORD MUST BE MADE IN ALL CAPS desc = "THERE CAN BE ONLY ONE, AND IT WILL BE YOU!!!\nActivate it in your hand to point to the nearest victim." flags_1 = CONDUCT_1 diff --git a/code/game/objects/structures/ghost_role_spawners.dm b/code/game/objects/structures/ghost_role_spawners.dm index 5d872a11678..60bfdee57da 100644 --- a/code/game/objects/structures/ghost_role_spawners.dm +++ b/code/game/objects/structures/ghost_role_spawners.dm @@ -380,135 +380,6 @@ new/obj/structure/fluff/empty_sleeper/syndicate(get_turf(src)) return ..() -// Start of Nostra change -/obj/effect/mob_spawn/human/spacepolice - name = "space policeman" - desc = "A sleeper designed for long-term stasis." - mob_name = "centcom policeman" - job_description = "Space Policeman" - icon = 'icons/obj/machines/sleeper.dmi' - icon_state = "sleeper" - objectives = list("Track down any Syndicate, Wizard Federation or Eldritch Worshippers and eliminate them, but under any circumstances are you to harm any loyal Employees of Nanotrasen.") //Nostra change - changed into list - death = FALSE - roundstart = FALSE - random = TRUE - id_job = "Policeman" - id_access = "assistant" - outfit = /datum/outfit/spacepoliceman - short_desc = "You are an undercover agent assigned by Spearhead Industries tasked with tracking down any Syndicate or Station Threatening Anomalies." - flavour_text = "You are an agent assigned by Spearhead Industries and tasked with rooting out and eliminating those classified enemies of Central Command such as the Syndicate, Wizard Federation, or worshipers of the Elder Gods Nar'sie and Ratvar. With hopes that our kind deeds to enforce Space Law beyond the borders of Sol will allow us, Spearhead Industries to gain a foot-hold in Nanotrasens Military Operations." - important_info = "DO NOT HARM ANY LOYAL NANOTRASEN CREW, OR THOSE IN COMMAND HAVE FULL RIGHT FOR YOUR EXTERMINATION" - assignedrole = "Space Policeman" -// End of Nostra change - -/datum/outfit/spacepoliceman - name = "Space Policeman" - uniform = /obj/item/clothing/under/rank/security/officer/spacepol - shoes = /obj/item/clothing/shoes/jackboots - mask = /obj/item/clothing/mask/gas/sechailer/swat/spacepol - head = /obj/item/clothing/head/helmet/police - ears = /obj/item/radio/headset - glasses = /obj/item/clothing/glasses/hud/security/sunglasses - back = /obj/item/tank/internals/oxygen - belt = /obj/item/gun/energy/e_gun/mini - suit = /obj/item/clothing/suit/armor/vest/blueshirt - suit_store = /obj/item/gun/energy/e_gun - gloves = /obj/item/clothing/gloves/tackler/combat - id = /obj/item/card/id - l_pocket = /obj/item/assembly/flash - r_pocket = /obj/item/restraints/handcuffs - implants = list(/obj/item/implant/mindshield) - -/obj/effect/mob_spawn/human/spacepolice/Destroy() - new/obj/structure/fluff/empty_sleeper/nanotrasen(get_turf(src)) - return ..() - -/obj/effect/mob_spawn/human/spacepolice/special(mob/living/carbon/human/new_spawn) - ADD_TRAIT(new_spawn,TRAIT_NOCLONE,GHOSTROLE_TRAIT) - ADD_TRAIT(new_spawn,TRAIT_NO_TELEPORT,GHOSTROLE_TRAIT) - ADD_TRAIT(new_spawn,TRAIT_RESISTLOWPRESSURE,GHOSTROLE_TRAIT) - ADD_TRAIT(new_spawn,TRAIT_RESISTCOLD,GHOSTROLE_TRAIT) - -//Mad Xenobiologist -/obj/effect/mob_spawn/human/madxenobiologist - name = "mad xenobiologist" - desc = "A sleeper designed for long-term stasis." - mob_name = "mad xenobio" - job_description = "Mad Xenobiologist" - icon = 'icons/obj/machines/sleeper.dmi' - icon_state = "sleeper" - //objectives = "" // Nostra change - death = FALSE - roundstart = FALSE - random = TRUE - id_job = "Scientist" - id_access = "scientist" - outfit = /datum/outfit/madxeno - short_desc = "You are the Mad Xenobiologist." - flavour_text = "You were a former Nanotrasen employee but due to your insane admiration for your slimes, and recent negotiations with the Animal Rights Consortium, betrayed Nanotrasen. Attempting to flee on a stolen Xenobiology Specialized Prototype Ship, but during your haste your ship's right rear thruster was barely struck by Bluespace Artillery, almost killing you. But by sheer chance you had stolen a single Metal Foam Grenade during your escape, saving you... for now." - important_info = "" - assignedrole = "Mad Xenobiologist" - var/themadspecies // Nostra change - -/datum/outfit/madxeno - name = "Mad Xenobiologist" - uniform = /obj/item/clothing/under/rank/rnd/scientist - shoes = /obj/item/clothing/shoes/sneakers/white - head = /obj/item/clothing/head/soft/purple - back = /obj/item/storage/backpack/satchel/tox - suit = /obj/item/clothing/suit/toggle/labcoat - id = /obj/item/card/id - -/obj/effect/mob_spawn/human/madxenobiologist/Destroy() - new/obj/structure/fluff/empty_sleeper(get_turf(src)) - return ..() - -/obj/effect/mob_spawn/human/madxenobiologist/special(mob/living/carbon/human/new_spawn) - ADD_TRAIT(new_spawn,TRAIT_UNSTABLE,GHOSTROLE_TRAIT) - to_chat(new_spawn, "Objective 1: Get sustainable power to your ship and survive using slimes.") - to_chat(new_spawn, "Objective 2: Spread slimes wherever you can.") - to_chat(new_spawn, "Objective 3: Take revenge upon Nanotrasen, transform them all into [themadspecies] in the name of the ARC and the lack of my sanity! HAHAHAHAHAHAHA!") // Nostra change - -// Ultimate Space Gamer -/obj/effect/mob_spawn/human/ultimatespacegamer - name = "ultimate gamer" - desc = "A sleeper designed for long-term stasis." - mob_name = "space gamer ultimate" - job_description = "Ultimate Space Gamer" - icon = 'icons/obj/machines/sleeper.dmi' - icon_state = "sleeper" - objectives = list("Be the best there ever was, and kill whoever threatens you superiority within the realm of VR.") //Nostra change - changed into list - death = FALSE - roundstart = FALSE - random = TRUE - id_job = "Gamer" - mob_species = /datum/species/human - outfit = /datum/outfit/gamergear - short_desc = "You are the ULTIMATE SPACE GAMER." - flavour_text = "From the start you were a failure, doomed for nothing but a life of sadness and sorrow. But with new found inspiration found with Donk Corporations and a lifetime supply of Donk Pockets on the line, you knew you were destined for something greater, something.... out of this world, or perhaps..... in another?" - important_info = "" - assignedrole = "Ultimate Space Gamer" - -/datum/outfit/gamergear - name = "Ultimate Space Gamer" - uniform = /obj/item/clothing/under/costume/swagoutfit - shoes = /obj/item/clothing/shoes/swagshoes - id = /obj/item/card/id/gold - -/obj/effect/mob_spawn/human/ultimatespacegamer/Destroy() - return ..() - -/obj/effect/mob_spawn/human/ultimatespacegamer/special(mob/living/new_spawn) - var/gamername = pick("xX_RobustClown_Xx","Ninja","Up-Dog","Wohn Jick","Engineer Gaming","icewallowcome","j0e","Xx_ghostasaur_xX", "Donk Co.") - //new_spawn.real_name = gamername //why this works when moving it from one function to another is beyond me - var/mob/living/carbon/human/H = new_spawn - var/obj/item/worn = H.wear_id - var/obj/item/card/id/id = worn.GetID() - id.registered_name = gamername - id.update_label() - to_chat(new_spawn, "Your goal? Be the best there ever was, beat the VR sleeper game and show your dominance as the ultimate gamer. Plus Donk Co. promised a life time supply of Donk Pockets, be it I kill any NT Employees divulging themselves in the VR world.") - - //Space Hotel Staff /obj/effect/mob_spawn/human/hotel_staff //not free antag u little shits name = "staff sleeper" @@ -618,40 +489,6 @@ implants = list(/obj/item/implant/mindshield) //No revolutionaries, he's MY friend. id = /obj/item/card/id -// Start of Nostra change -/obj/effect/mob_spawn/human/syndicate_agent_base_comms - name = "Syndicate Telecommunications Agent" - roundstart = FALSE - death = FALSE - icon = 'icons/obj/machines/sleeper.dmi' - icon_state = "sleeper_s" - outfit = /datum/outfit/syndicate_empty - assignedrole = "Syndicate Telecommunications Agent" - short_desc = "You are a Syndicate Telecommunications Agent" - flavour_text = "You have been assigned by MI13 in gathering intel about NT's latest technological breakthrough in Xeno-technology. Those slimes are more then Central Commmand is willing to give credit for, and this will bring their end too NT. Ensure no NT thugs come aboard your vessel at all costs." - important_info = "Do NOT kill the station crew unless your base has been discovered and breached by them." - objectives = "Gather as much intel about NT's Slime Operations as you can, ensure you and your fellow agent stay undetected." -// End of Nostra change - -/obj/effect/mob_spawn/human/syndicate_agent_base_infl - name = "Syndicate Infiltration Agent" - roundstart = FALSE - death = FALSE - icon = 'icons/obj/machines/sleeper.dmi' - icon_state = "sleeper_s" - outfit = /datum/outfit/syndicate_empty - assignedrole = "Syndicate Infiltration Agent" - short_desc = "You are a Syndicate Infiltration Agent" - flavour_text = "You have been assigned by Waffle Co. in infiltrating and retrieving the next generation of weapon development technology. Assure no NT scumbags acknowledge your presence and escape with the valuables in hand. Do not fail us." - important_info = "Do NOT kill the station crew unless your base has been discovered and breached by them." - objectives = list("Steal the Captains Antique Lasergun, ensure your presence stays undetected.") //Nostra change - changed into list - -/obj/effect/mob_spawn/human/syndicate_agent_base_comms/Destroy() - return ..() - -/obj/effect/mob_spawn/human/syndicate_agent_base_comms/special(mob/living/carbon/human/new_spawn) - to_chat(new_spawn, "Objectives: Gather as much intel about NT's Slime Operations as you can, ensure you and your fellow agent stay undetected.") - /obj/effect/mob_spawn/human/syndicate_agent_base_infl/Destroy() return ..() diff --git a/code/modules/clothing/outfits/standard.dm b/code/modules/clothing/outfits/standard.dm index a967cd824d8..1cd09097f41 100644 --- a/code/modules/clothing/outfits/standard.dm +++ b/code/modules/clothing/outfits/standard.dm @@ -267,23 +267,6 @@ head = /obj/item/clothing/head/culthood/alt/ghost r_hand = /obj/item/melee/cultblade/ghost -/datum/outfit/dead_cultist - name = "Dead Cultist" - - suit = /obj/item/clothing/suit/cultrobes - shoes = /obj/item/clothing/shoes/cult - head = /obj/item/clothing/head/culthood - -/datum/outfit/eskimo - name = "Eskimo" - - uniform = /obj/item/clothing/under/color/black - suit = /obj/item/clothing/suit/hooded/wintercoat - shoes = /obj/item/clothing/shoes/winterboots - head = /obj/item/clothing/head/hooded/winterhood - r_hand = /obj/item/spear - - /datum/outfit/wizard name = "Blue Wizard" diff --git a/code/modules/vehicles/speedbike.dm b/code/modules/vehicles/speedbike.dm index 5d79b4243b4..d0b9c1fe967 100644 --- a/code/modules/vehicles/speedbike.dm +++ b/code/modules/vehicles/speedbike.dm @@ -36,32 +36,6 @@ icon_state = "speedbike_red" overlay_state = "cover_red" -//The Law -/obj/vehicle/ridden/space/thelawspeedbike - name = "The Law" - icon = 'icons/obj/bike.dmi' - icon_state = "speedbike_blue" - layer = LYING_MOB_LAYER - var/overlay_state = "cover_blue" - var/mutable_appearance/overlay - -/obj/vehicle/ridden/space/thelawspeedbike/Initialize() - . = ..() - overlay = mutable_appearance(icon, overlay_state, ABOVE_MOB_LAYER) - add_overlay(overlay) - var/datum/component/riding/D = LoadComponent(/datum/component/riding) - D.set_riding_offsets(RIDING_OFFSET_ALL, list(TEXT_NORTH = list(0, -8), TEXT_SOUTH = list(0, 4), TEXT_EAST = list(-10, 5), TEXT_WEST = list( 10, 5))) - D.vehicle_move_delay = 2 - D.set_vehicle_dir_offsets(NORTH, -16, -16) - D.set_vehicle_dir_offsets(SOUTH, -16, -16) - D.set_vehicle_dir_offsets(EAST, -18, 0) - D.set_vehicle_dir_offsets(WEST, -18, 0) - -/obj/vehicle/ridden/space/thelawspeedbike/Move(newloc,move_dir) - if(has_buckled_mobs()) - new /obj/effect/temp_visual/dir_setting/speedbike_trail(loc,move_dir) - . = ..() - //BM SPEEDWAGON /obj/vehicle/ridden/space/speedwagon diff --git a/modular_nostra/code/__HELPERS/cmp.dm b/modular_nostra/code/__HELPERS/cmp.dm new file mode 100644 index 00000000000..954e8da02ca --- /dev/null +++ b/modular_nostra/code/__HELPERS/cmp.dm @@ -0,0 +1,2 @@ +/proc/cmp_typepaths_dsc(A, B) + return sorttext("[A]","[B]") diff --git a/modular_nostra/code/datums/ruins/lavaland.dm b/modular_nostra/code/datums/ruins/lavaland.dm new file mode 100644 index 00000000000..60d7230aff0 --- /dev/null +++ b/modular_nostra/code/datums/ruins/lavaland.dm @@ -0,0 +1,7 @@ +/datum/map_template/ruin/lavaland/lavaland_errorcodehostile + name = "errorcode-hostile" + id = "errorcodehostile" + description = "Signal Lost- Error... Code-Hostile" + suffix = "lavaland_errorcodehostile.dmm" + allow_duplicates = FALSE + cost = 10 diff --git a/modular_nostra/code/datums/ruins/space.dm b/modular_nostra/code/datums/ruins/space.dm new file mode 100644 index 00000000000..4a30a4019d8 --- /dev/null +++ b/modular_nostra/code/datums/ruins/space.dm @@ -0,0 +1,48 @@ +/datum/map_template/ruin/space/syndie_minibase_spawn + id = "syndie_minibase_spawn" + suffix = "syndie_minibase_spawn.dmm" + name = "Syndicate Communications and Retrieval Base" + description = "The Syndicate have placed you within close proximity of your target, gather what information you can about the base. Get in, steal the Captains Antique Raygun and get out. May best of luck be on your side soldier." + +/datum/map_template/ruin/space/dcshuttle + id = "dcshuttle" + suffix = "dcshuttle.dmm" + name = "DefCorp Ship" + description = "Jer" + +/datum/map_template/ruin/space/spiderden + id = "spiderden" + suffix = "spiderden.dmm" + name = "Spider Den" + description = "They tell stories of the crucades that happened millenias past..." + +/datum/map_template/ruin/space/dcderelict + id = "dcderelict" + suffix = "dcderelict.dmm" + name = "DC Derelict" + description = "A satellite for the mysterious corporation known as DefCorp, appears to be a bit dated." + +/datum/map_template/ruin/space/spacepolice + id = "spacepolice" + suffix = "spacepolice.dmm" + name = "Space Police" + description = "Hired by CentCom to keep you safe!" + +/datum/map_template/ruin/space/madxenobiologist + id = "madxenobiologist" + suffix = "madxenobiologist.dmm" + name = "Xenobiology Prototype Ship" + description = "I will get my revenge..." + +/datum/map_template/ruin/space/ultimatespacegamer + id = "ultimatespacegamer" + suffix = "ultimatespacegamer.dmm" + name = "gamerdome" + description = "Who will come ontop!?" + allow_duplicates = TRUE + +/datum/map_template/ruin/spacenearstation/roid11 + id = "roid11" + suffix = "roid11.dmm" + name = "Snow Roid" + description = "Mineral asteroid. Ft. Snow Biome with mysterious tree." diff --git a/modular_nostra/code/game/objects/items/polearms.dm b/modular_nostra/code/game/objects/items/polearms.dm index fb9cbbc1968..b04280429d4 100644 --- a/modular_nostra/code/game/objects/items/polearms.dm +++ b/modular_nostra/code/game/objects/items/polearms.dm @@ -1,8 +1,8 @@ /obj/item/carrotglaive icon_state = "carrotglaive0" icon = 'modular_nostra/icons/obj/items_and_weapons.dmi' - lefthand_file = 'modular_nostra/icons/mob/inhands/weapons/polearm_lefthand.dmi' - righthand_file = 'modular_nostra/icons/mob/inhands/weapons/polearm_righthand.dmi' + lefthand_file = 'modular_nostra/icons/mob/inhands/weapons/polearms_lefthand.dmi' + righthand_file = 'modular_nostra/icons/mob/inhands/weapons/polearms_righthand.dmi' name = "carrot glaive" desc = "So, you really thought that wrapping a carrot to a stick was a good idea? Well either way, you did, and... It's useful if your a madman." force = 7 diff --git a/modular_nostra/code/game/objects/items/spears.dm b/modular_nostra/code/game/objects/items/spears.dm index de25d282185..4a0d77d332b 100644 --- a/modular_nostra/code/game/objects/items/spears.dm +++ b/modular_nostra/code/game/objects/items/spears.dm @@ -1,8 +1,8 @@ /obj/item/spear/bamboospear //Blatant imitation of spear, but made out of bamboo. Not valid for explosive modification. icon = 'modular_nostra/icons/obj/items_and_weapons.dmi' icon_state = "bamboo_spear0" - lefthand_file = 'modular_nostra/icons/obj/polearms_lefthand.dmi' - righthand_file = 'modular_nostra/icons/obj/polearms_righthand.dmi' + lefthand_file = 'modular_nostra/icons/mob/inhands/weapons/polearms_lefthand.dmi' + righthand_file = 'modular_nostra/icons/mob/inhands/weapons/polearms_righthand.dmi' name = "bamboo spear" desc = "A haphazardly-constructed yet still deadly weapon. Made of thick bamboo." force = 9 @@ -11,7 +11,7 @@ reach = 2 throwforce = 32 //Stronger throwing damage embedding = list("embedded_impact_pain_multiplier" = 3) - armour_penetration = 13 + armour_penetration = 13 custom_materials = null hitsound = 'sound/weapons/bladeslice.ogg' attack_verb = list("attacked", "poked", "jabbed", "torn", "gored") diff --git a/modular_nostra/code/game/objects/items/weaponry.dm b/modular_nostra/code/game/objects/items/weaponry.dm index f850a35d9bd..3097c94bac9 100644 --- a/modular_nostra/code/game/objects/items/weaponry.dm +++ b/modular_nostra/code/game/objects/items/weaponry.dm @@ -132,4 +132,30 @@ throw_at(thrownby, 45, throw_speed, null, TRUE) . = ..() +/obj/item/claymore/unforgiven + name = "the unforgiven" + desc = "You feel betrayed, broken. Have they forgiven you? Will they forgive you!? Your mind spins with anger and confusion..." + hitsound = 'sound/weapons/sear.ogg' + force = 35 + throwforce = 15 + slot_flags = ITEM_SLOT_BACK + attack_verb = list("scorned", "carved", "seared", "sliced", "gashed", "glaved", "gutted") + block_chance = 30 + max_integrity = 500 + item_flags = SLOWS_WHILE_IN_HAND + +/obj/item/claymore/unforgiven/Initialize(mapload) + . = ..() + START_PROCESSING(SSobj, src) + AddComponent(/datum/component/butchering, 50, 105) + +/obj/item/claymore/unforgiven/Destroy() + STOP_PROCESSING(SSobj, src) + . = ..() +/obj/item/claymore/unforgiven/process() + slowdown = -0.2 + if(iscarbon(loc)) + var/mob/living/carbon/wielder = loc + if(wielder.is_holding(src)) + wielder.update_equipment_speed_mods() diff --git a/modular_nostra/code/game/objects/structures/ghost_role_spawners.dm b/modular_nostra/code/game/objects/structures/ghost_role_spawners.dm index daa1af85a6f..2301045192d 100644 --- a/modular_nostra/code/game/objects/structures/ghost_role_spawners.dm +++ b/modular_nostra/code/game/objects/structures/ghost_role_spawners.dm @@ -1,5 +1,159 @@ -/obj/effect/mob_spawn/human/madxenobiologist/Initialize(mapload) - . = ..() - var/list/madspecies = list("Felinids", "Lizards", "Slime People", "Mothmen", "Flypeople", "Arachnids") - themadspecies = "[pick(madspecies)]" - objectives = list("Transform all Nanotrasen employees into [themadspecies], avoid killing at all costs.") +// Space Police +/obj/effect/mob_spawn/human/spacepolice + name = "space policeman" + desc = "A sleeper designed for long-term stasis." + mob_name = "centcom policeman" + job_description = "Space Policeman" + icon = 'icons/obj/machines/sleeper.dmi' + icon_state = "sleeper" + objectives = list("Track down any Syndicate, Wizard Federation or Eldritch Worshippers and eliminate them, but under any circumstances you are not allowed to harm any loyal Employees of Nanotrasen.") + death = FALSE + roundstart = FALSE + random = TRUE + id_job = "Policeman" + id_access = "assistant" + outfit = /datum/outfit/spacepoliceman + short_desc = "You are an undercover agent assigned by Spearhead Industries tasked with tracking down any Syndicate or Station Threatening Anomalies." + flavour_text = "You are an agent assigned by Spearhead Industries and tasked with rooting out and eliminating those classified enemies of Central Command such as the Syndicate, Wizard Federation, or worshipers of the Elder Gods Nar'sie and Ratvar. With hopes that our kind deeds to enforce Space Law beyond the borders of Sol will allow us, Spearhead Industries to gain a foot-hold in Nanotrasens Military Operations." + important_info = "DO NOT HARM ANY LOYAL NANOTRASEN CREW, OR THOSE IN COMMAND HAVE FULL RIGHT FOR YOUR EXTERMINATION" + assignedrole = "Space Policeman" + +/datum/outfit/spacepoliceman + name = "Space Policeman" + uniform = /obj/item/clothing/under/rank/security/officer/spacepol + shoes = /obj/item/clothing/shoes/jackboots + mask = /obj/item/clothing/mask/gas/sechailer/swat/spacepol + head = /obj/item/clothing/head/helmet/police + ears = /obj/item/radio/headset + glasses = /obj/item/clothing/glasses/hud/security/sunglasses + back = /obj/item/tank/internals/oxygen + belt = /obj/item/gun/energy/e_gun/mini + suit = /obj/item/clothing/suit/armor/vest/blueshirt + suit_store = /obj/item/gun/energy/e_gun + gloves = /obj/item/clothing/gloves/tackler/combat + id = /obj/item/card/id + l_pocket = /obj/item/assembly/flash + r_pocket = /obj/item/restraints/handcuffs + implants = list(/obj/item/implant/mindshield) + +/obj/effect/mob_spawn/human/spacepolice/Destroy() + new/obj/structure/fluff/empty_sleeper/nanotrasen(get_turf(src)) + return ..() + +/obj/effect/mob_spawn/human/spacepolice/special(mob/living/carbon/human/new_spawn) + ADD_TRAIT(new_spawn,TRAIT_NOCLONE,GHOSTROLE_TRAIT) + ADD_TRAIT(new_spawn,TRAIT_NO_TELEPORT,GHOSTROLE_TRAIT) + ADD_TRAIT(new_spawn,TRAIT_RESISTLOWPRESSURE,GHOSTROLE_TRAIT) + ADD_TRAIT(new_spawn,TRAIT_RESISTCOLD,GHOSTROLE_TRAIT) + +//Mad Xenobiologist +/obj/effect/mob_spawn/human/madxenobiologist + name = "mad xenobiologist" + desc = "A sleeper designed for long-term stasis." + mob_name = "mad xenobio" + job_description = "Mad Xenobiologist" + icon = 'icons/obj/machines/sleeper.dmi' + icon_state = "sleeper" + //objectives = "" + death = FALSE + roundstart = FALSE + random = TRUE + id_job = "Scientist" + id_access = "scientist" + outfit = /datum/outfit/madxeno + short_desc = "You are the Mad Xenobiologist." + flavour_text = "You were a former Nanotrasen employee but due to your insane admiration for your slimes, and recent negotiations with the Animal Rights Consortium, betrayed Nanotrasen. Attempting to flee on a stolen Xenobiology Specialized Prototype Ship, but during your haste your ship's right rear thruster was barely struck by Bluespace Artillery, almost killing you. But by sheer chance you had stolen a single Metal Foam Grenade during your escape, saving you... for now." + important_info = "" + assignedrole = "Mad Xenobiologist" + var/themadspecies + +/datum/outfit/madxeno + name = "Mad Xenobiologist" + uniform = /obj/item/clothing/under/rank/rnd/scientist + shoes = /obj/item/clothing/shoes/sneakers/white + head = /obj/item/clothing/head/soft/purple + back = /obj/item/storage/backpack/satchel/tox + suit = /obj/item/clothing/suit/toggle/labcoat + id = /obj/item/card/id + +/obj/effect/mob_spawn/human/madxenobiologist/Destroy() + new/obj/structure/fluff/empty_sleeper(get_turf(src)) + return ..() + +/obj/effect/mob_spawn/human/madxenobiologist/special(mob/living/carbon/human/new_spawn) + ADD_TRAIT(new_spawn,TRAIT_UNSTABLE,GHOSTROLE_TRAIT) + to_chat(new_spawn, "Objective 1: Get sustainable power to your ship and survive using slimes.") + to_chat(new_spawn, "Objective 2: Spread slimes wherever you can.") + to_chat(new_spawn, "Objective 3: Take revenge upon Nanotrasen, transform them all into [themadspecies] in the name of the ARC and the lack of my sanity! HAHAHAHAHAHAHA!") + +// Ultimate Space Gamer +/obj/effect/mob_spawn/human/ultimatespacegamer + name = "ultimate gamer" + desc = "A sleeper designed for long-term stasis." + mob_name = "space gamer ultimate" + job_description = "Ultimate Space Gamer" + icon = 'icons/obj/machines/sleeper.dmi' + icon_state = "sleeper" + objectives = list("Be the best there ever was, and kill whoever threatens you superiority within the realm of VR.") + death = FALSE + roundstart = FALSE + random = TRUE + id_job = "Gamer" + mob_species = /datum/species/human + outfit = /datum/outfit/gamergear + short_desc = "You are the ULTIMATE SPACE GAMER." + flavour_text = "From the start you were a failure, doomed for nothing but a life of sadness and sorrow. But with new found inspiration found with Donk Corporations and a lifetime supply of Donk Pockets on the line, you knew you were destined for something greater, something.... out of this world, or perhaps..... in another?" + important_info = "" + assignedrole = "Ultimate Space Gamer" + +/datum/outfit/gamergear + name = "Ultimate Space Gamer" + uniform = /obj/item/clothing/under/costume/swagoutfit + shoes = /obj/item/clothing/shoes/swagshoes + id = /obj/item/card/id/gold + +/obj/effect/mob_spawn/human/ultimatespacegamer/Destroy() + return ..() + +/obj/effect/mob_spawn/human/ultimatespacegamer/special(mob/living/new_spawn) + var/gamername = pick("xX_RobustClown_Xx","Ninja","Up-Dog","Wohn Jick","Engineer Gaming","icewallowcome","j0e","Xx_ghostasaur_xX", "Donk Co.") + //new_spawn.real_name = gamername //why this works when moving it from one function to another is beyond me + var/mob/living/carbon/human/H = new_spawn + var/obj/item/worn = H.wear_id + var/obj/item/card/id/id = worn.GetID() + id.registered_name = gamername + id.update_label() + to_chat(new_spawn, "Your goal? Be the best there ever was, beat the VR sleeper game and show your dominance as the ultimate gamer. Plus Donk Co. promised a life time supply of Donk Pockets, be it I kill any NT Employees divulging themselves in the VR world.") + +// Comms Agent +/obj/effect/mob_spawn/human/syndicate_agent_base_comms + name = "Syndicate Telecommunications Agent" + roundstart = FALSE + death = FALSE + icon = 'icons/obj/machines/sleeper.dmi' + icon_state = "sleeper_s" + outfit = /datum/outfit/syndicate_empty + assignedrole = "Syndicate Telecommunications Agent" + short_desc = "You are a Syndicate Telecommunications Agent" + flavour_text = "You have been assigned by MI13 in gathering intel about NT's latest technological breakthrough in Xeno-technology. Those slimes are more then Central Commmand is willing to give credit for, and this will bring their end too NT. Ensure no NT thugs come aboard your vessel at all costs." + important_info = "Do NOT kill the station crew unless your base has been discovered and breached by them." + objectives = "Gather as much intel about NT's Slime Operations as you can, ensure you and your fellow agent stay undetected." + +/obj/effect/mob_spawn/human/syndicate_agent_base_infl + name = "Syndicate Infiltration Agent" + roundstart = FALSE + death = FALSE + icon = 'icons/obj/machines/sleeper.dmi' + icon_state = "sleeper_s" + outfit = /datum/outfit/syndicate_empty + assignedrole = "Syndicate Infiltration Agent" + short_desc = "You are a Syndicate Infiltration Agent" + flavour_text = "You have been assigned by Waffle Co. in infiltrating and retrieving the next generation of weapon development technology. Assure no NT scumbags acknowledge your presence and escape with the valuables in hand. Do not fail us." + important_info = "Do NOT kill the station crew unless your base has been discovered and breached by them." + objectives = list("Steal the Captains Antique Lasergun, ensure your presence stays undetected.") //Nostra change - changed into list + +/obj/effect/mob_spawn/human/syndicate_agent_base_comms/Destroy() + return ..() + +/obj/effect/mob_spawn/human/syndicate_agent_base_comms/special(mob/living/carbon/human/new_spawn) + to_chat(new_spawn, "Objectives: Gather as much intel about NT's Slime Operations as you can, ensure you and your fellow agent stay undetected.") diff --git a/modular_nostra/code/modules/cargo/supply_pack/lizard_crates.dm b/modular_nostra/code/modules/cargo/supply_pack/lizard_crates.dm index 69526525077..4e29c409986 100644 --- a/modular_nostra/code/modules/cargo/supply_pack/lizard_crates.dm +++ b/modular_nostra/code/modules/cargo/supply_pack/lizard_crates.dm @@ -2,13 +2,13 @@ name = "Tiziran Ingredients Crate" desc = "For all those aspiring lizard Chefs, now you too can fill the kitchen with the delights of our Empire!" cost = 1500 - contains = list(/obj/item/reagent_containers/food/snacks/larvae, - /obj/item/reagent_containers/food/snacks/desert_snails, + contains = list(/obj/item/reagent_containers/food/snacks/canned_larvae, + /obj/item/reagent_containers/food/snacks/canned_desert_snails, /obj/item/reagent_containers/food/snacks/canned_jellyfish, /obj/item/reagent_containers/food/snacks/moonfish_eggs, - /obj/item/reagent_containers/food/snacks/desert_snails, + /obj/item/reagent_containers/food/snacks/canned_desert_snails, /obj/item/reagent_containers/food/snacks/canned_jellyfish, - /obj/item/reagent_containers/food/snacks/larvae, + /obj/item/reagent_containers/food/snacks/canned_larvae, /obj/item/reagent_containers/food/snacks/moonfish_eggs, /obj/item/reagent_containers/food/snacks/canned_jellyfish) crate_name = "tiziran ingredients crate" diff --git a/modular_nostra/code/modules/clothing/outfits/standard.dm b/modular_nostra/code/modules/clothing/outfits/standard.dm new file mode 100644 index 00000000000..582509e7383 --- /dev/null +++ b/modular_nostra/code/modules/clothing/outfits/standard.dm @@ -0,0 +1,15 @@ +/datum/outfit/dead_cultist + name = "Dead Cultist" + + suit = /obj/item/clothing/suit/cultrobes + shoes = /obj/item/clothing/shoes/cult + head = /obj/item/clothing/head/culthood + +/datum/outfit/eskimo + name = "Eskimo" + + uniform = /obj/item/clothing/under/color/black + suit = /obj/item/clothing/suit/hooded/wintercoat + shoes = /obj/item/clothing/shoes/winterboots + head = /obj/item/clothing/head/hooded/winterhood + r_hand = /obj/item/spear diff --git a/modular_nostra/code/modules/food_and_drinks/food/lizards/lizard.dm b/modular_nostra/code/modules/food_and_drinks/food/lizards/lizard.dm index 7a7a186f922..d7a5de48402 100644 --- a/modular_nostra/code/modules/food_and_drinks/food/lizards/lizard.dm +++ b/modular_nostra/code/modules/food_and_drinks/food/lizards/lizard.dm @@ -8,7 +8,7 @@ /obj/item/reagent_containers/food/snacks/raw_tiziran_sausage name = "raw Tiziran blood sausage" desc = "A raw Tiziran blood sausage, ready to be cured on a drying rack." - icon = 'modular_nostra/icons/obj/lizard_food.dmi' + icon = 'modular_nostra/icons/obj/food/food.dmi' icon_state = "raw_lizard_sausage" list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/blood = 3) tastes = list("meat" = 1, "black pudding" = 1) @@ -22,7 +22,7 @@ /obj/item/reagent_containers/food/snacks/tiziran_sausage name = "\improper Tiziran blood sausage" desc = "A coarse dry-cured blood sausage, traditionally made by farmers in the farmlands around Zagoskeld. Similar in texture to old-Earth Spanish chorizo." - icon = 'modular_nostra/icons/obj/lizard_food.dmi' + icon = 'modular_nostra/icons/obj/food/food.dmi' icon_state = "lizard_sausage" list_reagents = list(/datum/reagent/consumable/nutriment = 5) tastes = list("meat" = 1, "black pudding" = 1) @@ -32,7 +32,7 @@ /obj/item/reagent_containers/food/snacks/raw_headcheese name = "raw headcheese block" desc = "A common food on Tizira, headcheese is traditionally made of an animal's head, with the organs removed, boiled until it falls apart, at which point it is collected, strained of moisture, sodiumchlorideed heavily, packed into blocks, and left to dry and age for several months. The resulting hard block tastes similar to cheese." - icon = 'modular_nostra/icons/obj/lizard_food.dmi' + icon = 'modular_nostra/icons/obj/food/food.dmi' icon_state = "raw_lizard_cheese" list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/sodiumchloride = 5) tastes = list("meat" = 1, "sodiumchloride" = 1) @@ -46,7 +46,7 @@ /obj/item/reagent_containers/food/snacks/headcheese name = "headcheese block" desc = "A cured block of headcheese. Delicious, if you're a lizard." - icon = 'modular_nostra/icons/obj/lizard_food.dmi' + icon = 'modular_nostra/icons/obj/food/food.dmi' icon_state = "lizard_cheese" list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/sodiumchloride = 5) tastes = list("cheese" = 1, "sodiumchloride" = 1) @@ -62,7 +62,7 @@ /obj/item/reagent_containers/food/snacks/headcheese_slice name = "headcheese slice" desc = "A slice of headcheese, useful for making sandwiches and snacks. Or surviving the cold Tiziran winters." - icon = 'modular_nostra/icons/obj/lizard_food.dmi' + icon = 'modular_nostra/icons/obj/food/food.dmi' icon_state = "lizard_cheese_slice" list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/sodiumchloride = 1) tastes = list("cheese" = 1, "sodiumchloride" = 1) @@ -72,7 +72,7 @@ /obj/item/reagent_containers/food/snacks/shredded_lungs name = "crispy shredded lung stirfry" desc = "Crispy lung strips, with veggies and a spicy sauce. Delicious, if you like lungs." - icon = 'modular_nostra/icons/obj/lizard_food.dmi' + icon = 'modular_nostra/icons/obj/food/food.dmi' icon_state = "lung_stirfry" list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 2, /datum/reagent/consumable/capsaicin = 1) tastes = list("meat" = 1, "heat" = 1, "veggies" = 1) @@ -82,7 +82,7 @@ /obj/item/reagent_containers/food/snacks/tsatsikh name = "tsatsikh" desc = "A Tiziran dish consisting of spiced ground offal, stuffed into a stomach and boiled. Pretty foul to anyone who's not used to the taste." - icon = 'modular_nostra/icons/obj/lizard_food.dmi' + icon = 'modular_nostra/icons/obj/food/food.dmi' icon_state = "tsatsikh" list_reagents = list(/datum/reagent/consumable/nutriment = 5) tastes = list("assorted minced organs" = 1) @@ -92,7 +92,7 @@ /obj/item/reagent_containers/food/snacks/liver_pate name = "liver pate" desc = "A rich, meaty paste made from liver, meat, and a few additions for extra flavour." - icon = 'modular_nostra/icons/obj/lizard_food.dmi' + icon = 'modular_nostra/icons/obj/food/food.dmi' icon_state = "pate" list_reagents = list(/datum/reagent/consumable/nutriment = 3) tastes = list("liver" = 1) @@ -102,7 +102,7 @@ /obj/item/reagent_containers/food/snacks/moonfish_eggs name = "moonfish eggs" desc = "The moonfish lays large, transparent white eggs which are prized in lizard cooking. Their flavour is similar to caviar, but generally is described as deeper and more complex." - icon = 'modular_nostra/icons/obj/lizard_food.dmi' + icon = 'modular_nostra/icons/obj/food/food.dmi' icon_state = "moonfish_eggs" list_reagents = list(/datum/reagent/consumable/nutriment = 2) tastes = list("caviar" = 1) @@ -112,7 +112,7 @@ /obj/item/reagent_containers/food/snacks/moonfish_caviar name = "moonfish caviar paste" desc = "A rich paste made from moonfish eggs. Generally the only way most lizards can get them, and used fairly heavily in coastal cooking." - icon = 'modular_nostra/icons/obj/lizard_food.dmi' + icon = 'modular_nostra/icons/obj/food/food.dmi' icon_state = "moonfish_caviar" list_reagents = list(/datum/reagent/consumable/nutriment = 2) tastes = list("caviar" = 1) @@ -122,7 +122,7 @@ /obj/item/reagent_containers/food/snacks/lizard_escargot name = "desert snail cocleas" desc = "Another example of cultural crossover between lizards and humans, desert snail escargot is closer to the Roman dish cocleas than the contemporary French escargot. It's a common street food in the desert cities." - icon = 'modular_nostra/icons/obj/lizard_food.dmi' + icon = 'modular_nostra/icons/obj/food/food.dmi' icon_state = "lizard_escargot" list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/garlic = 1) tastes = list("snails" = 1, "garlic" = 1, "oil" = 1) @@ -132,7 +132,7 @@ /obj/item/reagent_containers/food/snacks/fried_blood_sausage name = "fried blood sausage" desc = "A blood sausage, battered and deep fried. Commonly served with fries as a quick and simple snack on the streets of Zagoskeld." - icon = 'modular_nostra/icons/obj/lizard_food.dmi' + icon = 'modular_nostra/icons/obj/food/food.dmi' icon_state = "fried_blood_sausage" list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/sodiumchloride = 1, /datum/reagent/consumable/cooking_oil = 1) tastes = list("black pudding" = 1, "batter" = 1, "oil" = 1) @@ -143,7 +143,7 @@ /obj/item/reagent_containers/food/snacks/lizard_fries name = "loaded poms-franzisks" desc = "One of the many human foods to make its way to the lizards was french fries, which are called poms-franzisks in Draconic. When topped with barbecued meat and sauce, they make a hearty meal." - icon = 'modular_nostra/icons/obj/lizard_food.dmi' + icon = 'modular_nostra/icons/obj/food/food.dmi' icon_state = "lizard_fries" list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/sodiumchloride = 1, /datum/reagent/consumable/bbqsauce = 2) tastes = list("fries" = 2, "bbq sauce" = 1, "barbecued meat" = 1) @@ -153,7 +153,7 @@ /obj/item/reagent_containers/food/snacks/brain_pate name = "eyeball-and-brain pate" desc = "A thick pink puree made from finely chopped poached eyeballs and brains, fried onions, and fat. Lizards swear it's delicious!" - icon = 'modular_nostra/icons/obj/lizard_food.dmi' + icon = 'modular_nostra/icons/obj/food/food.dmi' icon_state = "brain_pate" list_reagents = list(/datum/reagent/consumable/nutriment = 5) tastes = list("brains" = 2) @@ -163,7 +163,7 @@ /obj/item/reagent_containers/food/snacks/crispy_headcheese name = "crispy breaded headcheese" desc = "A delicious snack from the streets of Zagoskeld, consisting of headcheese coated in rootbread breadcrumbs. Commonly served with fries." - icon = 'modular_nostra/icons/obj/lizard_food.dmi' + icon = 'modular_nostra/icons/obj/food/food.dmi' icon_state = "crispy_headcheese" list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/cooking_oil = 1) tastes = list("cheese" = 1, "oil" = 1) @@ -173,7 +173,7 @@ /obj/item/reagent_containers/food/snacks/kebab/picoss_skewers name = "picoss skewer" desc = "A popular Tiziran streetfood consisting of vinegar-marinated armorfish on a skewer with onion and chillis." - icon = 'modular_nostra/icons/obj/lizard_food.dmi' + icon = 'modular_nostra/icons/obj/food/food.dmi' icon_state = "picoss_skewer" list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/capsaicin = 1) tastes = list("fish" = 1, "acid" = 1, "onion" = 1, "heat" = 1) @@ -183,7 +183,7 @@ /obj/item/reagent_containers/food/snacks/nectar_larvae name = "nectar larvae" desc = "Little crispy larvae in a korta nectar based sweet and spicy sauce. Bugtastic!" - icon = 'modular_nostra/icons/obj/lizard_food.dmi' + icon = 'modular_nostra/icons/obj/food/food.dmi' icon_state = "nectar_larvae" list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/korta_nectar = 2, /datum/reagent/consumable/capsaicin = 1) tastes = list("meat" = 1, "sweet" = 1, "heat" = 1) @@ -193,7 +193,7 @@ /obj/item/reagent_containers/food/snacks/mushroomy_stirfry name = "mushroomy stirfry" desc = "A medley of mushrooms, made to meet your monstrous munchies. Marvelous!" - icon = 'modular_nostra/icons/obj/lizard_food.dmi' + icon = 'modular_nostra/icons/obj/food/food.dmi' icon_state = "mushroomy_stirfry" list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 3) tastes = list("marvelous mushrooms" = 1, "sublime shrooms" = 1) @@ -204,7 +204,7 @@ /obj/item/reagent_containers/food/snacks/grilled_moonfish name = "grilled moonfish" desc = "A slab of grilled moonfish. Traditionally served over scalloped roots with a wine-based sauce." - icon = 'modular_nostra/icons/obj/lizard_food.dmi' + icon = 'modular_nostra/icons/obj/food/food.dmi' icon_state = "grilled_moonfish" list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment = 3) tastes = list("fish" = 1) @@ -215,7 +215,7 @@ /obj/item/reagent_containers/food/snacks/moonfish_demiglace name = "moonfish demiglace" desc = "A slab of beautifully seared moonfish on a bed of potatoes and carrots, with a wine and demiglace reduction on top. Simply marvelous." - icon = 'modular_nostra/icons/obj/lizard_food.dmi' + icon = 'modular_nostra/icons/obj/food/food.dmi' icon_state = "moonfish_demiglace" list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment = 3) tastes = list("fish" = 1) @@ -225,7 +225,7 @@ /obj/item/reagent_containers/food/snacks/lizard_surf_n_turf name = "\improper Zagosk surf 'n' turf smorgasbord" desc = "A massive platter of Tizira's finest meat and seafood, typically shared by groups at the beach. Of course, nothing's stopping you eating it on your own... fatass." - icon = 'modular_nostra/icons/obj/lizard_food.dmi' + icon = 'modular_nostra/icons/obj/food/food.dmi' icon_state = "surf_n_turf" list_reagents = list(/datum/reagent/consumable/nutriment = 15, /datum/reagent/consumable/nutriment = 10, /datum/reagent/consumable/nutriment/vitamin = 10) tastes = list("surf" = 1, "turf" = 1) @@ -237,7 +237,7 @@ /obj/item/reagent_containers/food/snacks/spaghetti/nizaya name = "nizaya pasta" desc = "A form of root and nut pasta originally native to the oceanside regions of Tizira. It's similar in texture and appearance to gnocchi." - icon = 'modular_nostra/icons/obj/lizard_food.dmi' + icon = 'modular_nostra/icons/obj/food/food.dmi' icon_state = "nizaya" list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 2) tastes = list("gnocchi" = 1) @@ -246,7 +246,7 @@ /obj/item/reagent_containers/food/snacks/spaghetti/snail_nizaya name = "desert snail nizaya" desc = "A high class pasta dish from Tizira's vineyard region of Valyngia. Traditionally made with only the finest Tiziran wine... but the human swill will do, in a pinch." - icon = 'modular_nostra/icons/obj/lizard_food.dmi' + icon = 'modular_nostra/icons/obj/food/food.dmi' icon_state = "snail_nizaya" list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 6) tastes = list("snails" = 1, "wine" = 1, "gnocchi" = 1) @@ -255,7 +255,7 @@ /obj/item/reagent_containers/food/snacks/spaghetti/garlic_nizaya name = "garlic-and-oil nizaya" desc = "A lizard adaptation of the Italian pasta dish, aglio e olio, made with nizaya pasta." - icon = 'modular_nostra/icons/obj/lizard_food.dmi' + icon = 'modular_nostra/icons/obj/food/food.dmi' icon_state = "garlic_nizaya" list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 8) tastes = list("garlic" = 1, "oil" = 1, "gnocchi" = 1) @@ -264,7 +264,7 @@ /obj/item/reagent_containers/food/snacks/spaghetti/demit_nizaya name = "demit nizaya" desc = "A sweet, creamy nizaya pasta dish made with korta milk and nectar." - icon = 'modular_nostra/icons/obj/lizard_food.dmi' + icon = 'modular_nostra/icons/obj/food/food.dmi' icon_state = "demit_nizaya" list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/korta_nectar = 2) tastes = list("peppery sweet" = 1, "veggies" = 1, "gnocchi" = 1) @@ -273,7 +273,7 @@ /obj/item/reagent_containers/food/snacks/spaghetti/mushroom_nizaya name = "mushroom nizaya" desc = "A nizaya pasta dish made with seraka mushrooms and quality oil. Has a pronounced nutty flavour." - icon = 'modular_nostra/icons/obj/lizard_food.dmi' + icon = 'modular_nostra/icons/obj/food/food.dmi' icon_state = "mushroom_nizaya" list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 2) tastes = list("savouriness" = 1, "nuttiness" = 1, "gnocchi" = 1) @@ -284,7 +284,7 @@ /obj/item/reagent_containers/food/snacks/rootdough name = "root dough" desc = "A root based dough, made with nuts and tubers. Used in a wide range of Tiziran cooking." - icon = 'modular_nostra/icons/obj/lizard_food.dmi' + icon = 'modular_nostra/icons/obj/food/food.dmi' icon_state = "rootdough" cooked_type = /obj/item/reagent_containers/food/snacks/bread/root list_reagents = list(/datum/reagent/consumable/nutriment = 2) @@ -314,7 +314,7 @@ /obj/item/reagent_containers/food/snacks/flatrootdough name = "flat rootdough" desc = "Flattened rootdough, ready to be made into a flatbread, or cut into segments." - icon = 'modular_nostra/icons/obj/lizard_food.dmi' + icon = 'modular_nostra/icons/obj/food/food.dmi' icon_state = "flat_rootdough" cooked_type = /obj/item/reagent_containers/food/snacks/root_flatbread slice_path = /obj/item/reagent_containers/food/snacks/rootdoughslice @@ -344,7 +344,7 @@ /obj/item/reagent_containers/food/snacks/rootdoughslice name = "rootdough ball" desc = "A ball of root dough. Perfect for making pasta or rolls." - icon = 'modular_nostra/icons/obj/lizard_food.dmi' + icon = 'modular_nostra/icons/obj/food/food.dmi' icon_state = "rootdough_slice" cooked_type = /obj/item/reagent_containers/food/snacks/rootroll list_reagents = list(/datum/reagent/consumable/nutriment = 2) @@ -367,7 +367,7 @@ /obj/item/reagent_containers/food/snacks/root_flatbread name = "root flatbread" desc = "A plain grilled root flatbread. Can be topped with a variety of foods that lizards like to eat." - icon = 'modular_nostra/icons/obj/lizard_food.dmi' + icon = 'modular_nostra/icons/obj/food/food.dmi' icon_state = "root_flatbread" list_reagents = list(/datum/reagent/consumable/nutriment = 7) tastes = list("bread" = 1, "earthy heat" = 1) @@ -377,7 +377,7 @@ /obj/item/reagent_containers/food/snacks/rootroll name = "rootroll" desc = "A dense, chewy roll, made from roots. A nice companion to a bowl of soup." - icon = 'modular_nostra/icons/obj/lizard_food.dmi' + icon = 'modular_nostra/icons/obj/food/food.dmi' icon_state = "rootroll" list_reagents = list(/datum/reagent/consumable/nutriment = 3) w_class = WEIGHT_CLASS_SMALL @@ -390,7 +390,7 @@ /obj/item/reagent_containers/food/snacks/bread/root name = "rootbread" desc = "The lizard equivalent to bread, made from tubers like potatoes and yams mixed with ground nuts and seeds. Noticably denser than regular bread." - icon = 'modular_nostra/icons/obj/lizard_food.dmi' + icon = 'modular_nostra/icons/obj/food/food.dmi' icon_state = "lizard_bread" list_reagents = list(/datum/reagent/consumable/nutriment = 10) slice_path = /obj/item/reagent_containers/food/snacks/breadslice/root @@ -411,7 +411,7 @@ /obj/item/reagent_containers/food/snacks/breadslice/root name = "rootbread slice" desc = "A slice of dense, chewy rootbread." - icon = 'modular_nostra/icons/obj/lizard_food.dmi' + icon = 'modular_nostra/icons/obj/food/food.dmi' icon_state = "lizard_breadslice" list_reagents = list(/datum/reagent/consumable/nutriment = 2) custom_food_type = /obj/item/reagent_containers/food/snacks/customizable/bread @@ -427,7 +427,7 @@ /obj/item/reagent_containers/food/snacks/pizza/rustic_flatbread name = "rustic flatbread" desc = "A simple Tiziran country dish, popular as a side to meat or fish dishes. Topped with herbs and oil." - icon = 'modular_nostra/icons/obj/lizard_food.dmi' + icon = 'modular_nostra/icons/obj/food/food.dmi' icon_state = "rustic_flatbread" list_reagents = list(/datum/reagent/consumable/nutriment = 15, /datum/reagent/consumable/nutriment/vitamin = 10) tastes = list("bread" = 1, "herb" = 1, "oil" = 1, "garlic" = 1) @@ -442,7 +442,7 @@ /obj/item/reagent_containers/food/snacks/pizza/italic_flatbread name = "\improper Italic flatbread" desc = "The introduction of human foods to Tizira led to an advancement in lizard cooking- the Italic flatbread is now a common sight on the menus of takeout stores on the planet." - icon = 'modular_nostra/icons/obj/lizard_food.dmi' + icon = 'modular_nostra/icons/obj/food/food.dmi' icon_state = "italic_flatbread" list_reagents = list(/datum/reagent/consumable/nutriment = 15, /datum/reagent/consumable/nutriment = 10, /datum/reagent/consumable/nutriment/vitamin = 15) tastes = list("bread" = 1, "herb" = 1, "oil" = 1, "garlic" = 1, "tomato" = 1, "meat" = 1) @@ -457,7 +457,7 @@ /obj/item/reagent_containers/food/snacks/pizza/imperial_flatbread name = "\improper Imperial flatbread" desc = "A flatbread topped with pate, pickled vegetables, and cubed headcheese. Not very suited to anyone's tastes but the lizards." - icon = 'modular_nostra/icons/obj/lizard_food.dmi' + icon = 'modular_nostra/icons/obj/food/food.dmi' icon_state = "imperial_flatbread" list_reagents = list(/datum/reagent/consumable/nutriment = 15, /datum/reagent/consumable/nutriment = 10, /datum/reagent/consumable/nutriment/vitamin = 15) tastes = list("bread" = 1, "herb" = 1, "oil" = 1, "garlic" = 1, "tomato" = 1, "meat" = 1) @@ -473,7 +473,7 @@ /obj/item/reagent_containers/food/snacks/emperor_roll name = "emperor roll" desc = "A popular sandwich on Tizira, named in honour of the Imperial family." - icon = 'modular_nostra/icons/obj/lizard_food.dmi' + icon = 'modular_nostra/icons/obj/food/food.dmi' icon_state = "emperor_roll" list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment = 7, /datum/reagent/consumable/nutriment/vitamin = 1) tastes = list("bread" = 1, "cheese" = 1, "liver" = 1, "caviar" = 1) @@ -483,7 +483,7 @@ /obj/item/reagent_containers/food/snacks/honey_roll name = "honey sweetroll" desc = "A sweetened rootroll with sliced fruit, enjoyed as a seasonal dessert on Tizira." - icon = 'modular_nostra/icons/obj/lizard_food.dmi' + icon = 'modular_nostra/icons/obj/food/food.dmi' icon_state = "honey_roll" list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 2, /datum/reagent/consumable/honey = 2) tastes = list("bread" = 1, "honey" = 1, "fruit" = 1) @@ -494,7 +494,7 @@ /obj/item/reagent_containers/food/snacks/soup/atrakor_dumplings name = "\improper Atrakor dumpling soup" desc = "A bowl of rich, meaty dumpling soup, traditionally served during the festival of Atrakor's Might on Tizira. The dumplings are shaped like the Night Sky Lord himself." - icon = 'modular_nostra/icons/obj/lizard_food.dmi' + icon = 'modular_nostra/icons/obj/food/food.dmi' icon_state = "atrakor_dumplings" list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 2) tastes = list("bone broth" = 1, "onion" = 1, "potato" = 1) @@ -503,7 +503,7 @@ /obj/item/reagent_containers/food/snacks/soup/meatball_noodles name = "meatball noodle soup" desc = "A hearty noodle soup made from meatballs and nizaya in a rich broth. Commonly topped with a handful of chopped nuts." - icon = 'modular_nostra/icons/obj/lizard_food.dmi' + icon = 'modular_nostra/icons/obj/food/food.dmi' icon_state = "meatball_noodles" list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 2) tastes = list("bone broth" = 1, "meat" = 1, "gnocchi" = 1, "peanuts" = 1) @@ -512,7 +512,7 @@ /obj/item/reagent_containers/food/snacks/soup/black_broth name = "\improper Tiziran black broth" desc = "A bowl of sausage, onion, blood and vinegar, served ice cold. Every bit as rough as it sounds." - icon = 'modular_nostra/icons/obj/lizard_food.dmi' + icon = 'modular_nostra/icons/obj/food/food.dmi' icon_state = "black_broth" list_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/blood = 5) tastes = list("vinegar" = 1, "metal" = 1) @@ -521,7 +521,7 @@ /obj/item/reagent_containers/food/snacks/soup/jellyfish name = "jellyfish stew" desc = "A slimy bowl of jellyfish stew. It jiggles if you shake it." - icon = 'modular_nostra/icons/obj/lizard_food.dmi' + icon = 'modular_nostra/icons/obj/food/food.dmi' icon_state = "jellyfish_stew" list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment = 3) tastes = list("slime" = 1) @@ -530,7 +530,7 @@ /obj/item/reagent_containers/food/snacks/soup/rootbread_soup name = "rootbread soup" desc = "A big bowl of spicy, savoury soup made with rootbread. Heavily seasoned, and very tasty." - icon = 'modular_nostra/icons/obj/lizard_food.dmi' + icon = 'modular_nostra/icons/obj/food/food.dmi' icon_state = "rootbread_soup" list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 3) tastes = list("bread" = 1, "egg" = 1, "chili" = 1, "garlic" = 1) @@ -540,7 +540,7 @@ /obj/item/reagent_containers/food/snacks/black_eggs name = "black scrambled eggs" desc = "A country dish from rural Tizira. Made with eggs, blood, and foraged greens. Traditionally eaten with rootbread and a spicy sauce." - icon = 'modular_nostra/icons/obj/lizard_food.dmi' + icon = 'modular_nostra/icons/obj/food/food.dmi' icon_state = "black_eggs" list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 2) tastes = list("eggs" = 1, "greens" = 1, "blood" = 1) @@ -550,7 +550,7 @@ /obj/item/reagent_containers/food/snacks/patzikula name = "patzikula" desc = "A smooth and spicy tomato-based sauce topped with eggs and baked. Delicious." - icon = 'modular_nostra/icons/obj/lizard_food.dmi' + icon = 'modular_nostra/icons/obj/food/food.dmi' icon_state = "patzikula" list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 4, /datum/reagent/consumable/capsaicin = 1) tastes = list("eggs" = 1, "tomato" = 1, "heat" = 1) @@ -562,7 +562,7 @@ /obj/item/reagent_containers/food/snacks/cake/korta_brittle name = "korta brittle slab" desc = "A big slab of korta nut brittle. So sugary it should be a crime!" - icon = 'modular_nostra/icons/obj/lizard_food.dmi' + icon = 'modular_nostra/icons/obj/food/food.dmi' icon_state = "korta_brittle" slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/korta_brittle slices_num = 5 @@ -576,7 +576,7 @@ /obj/item/reagent_containers/food/snacks/cakeslice/korta_brittle name = "korta brittle slice" desc = "A little slice of korta nut brittle. A diabetic's worst enemy." - icon = 'modular_nostra/icons/obj/lizard_food.dmi' + icon = 'modular_nostra/icons/obj/food/food.dmi' icon_state = "korta_brittle_slice" list_reagents = list(/datum/reagent/consumable/sugar = 2, /datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/korta_nectar = 1) tastes = list("peppery heat" = 1, "sweetness" = 1) @@ -585,7 +585,7 @@ /obj/item/reagent_containers/food/snacks/snowcones/korta_ice name = "korta ice" desc = "Shaved ice, korta nectar and berries. A sweet treat to eat to beat summer heat!" - icon = 'modular_nostra/icons/obj/lizard_food.dmi' + icon = 'modular_nostra/icons/obj/food/food.dmi' icon_state = "korta_ice" list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/ice = 4, /datum/reagent/consumable/berryjuice = 4) tastes = list("peppery sweet" = 1, "berry" = 1) @@ -594,7 +594,7 @@ /obj/item/reagent_containers/food/snacks/kebab/candied_mushrooms name = "candied mushrooms" desc = "A slightly bizarre dish from Tizira, consisting of seraka mushrooms coated with caramel on a skewer. Carries a pronounced 'sweet and savoury' kick." - icon = 'modular_nostra/icons/obj/lizard_food.dmi' + icon = 'modular_nostra/icons/obj/food/food.dmi' icon_state = "candied_mushrooms" list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 2, /datum/reagent/consumable/caramel = 3) tastes = list("savouriness" = 1, "sweetness" = 1) @@ -604,7 +604,7 @@ /obj/item/reagent_containers/food/snacks/sauerkraut name = "sauerkraut" desc = "Pickled cabbage, as made famous by Germans, and which has become common in lizard cooking, where it is known as Zauerkrat." - icon = 'modular_nostra/icons/obj/lizard_food.dmi' + icon = 'modular_nostra/icons/obj/food/food.dmi' icon_state = "sauerkraut" list_reagents = list(/datum/reagent/consumable/nutriment = 3) tastes = list("cabbage" = 1, "acid" = 1) @@ -614,7 +614,7 @@ /obj/item/reagent_containers/food/snacks/lizard_dumplings name = "\improper Tiziran dumplings" desc = "Mashed root vegetables, mixed with korta flour and boiled to produce a large, round and slightly spicy dumpling. Commonly eaten in soup." - icon = 'modular_nostra/icons/obj/lizard_food.dmi' + icon = 'modular_nostra/icons/obj/food/food.dmi' icon_state = "lizard_dumplings" list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 2) tastes = list("potato" = 1, "earthy heat" = 1) @@ -624,7 +624,7 @@ /obj/item/reagent_containers/food/snacks/steeped_mushrooms name = "steeped seraka mushrooms" desc = "Seraka mushrooms that have been steeped in alkaline water to remove the extract, thereby making them completely safe to consume." - icon = 'modular_nostra/icons/obj/lizard_food.dmi' + icon = 'modular_nostra/icons/obj/food/food.dmi' icon_state = "steeped_mushrooms" list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 1) tastes = list("savouriness" = 1, "nuttiness" = 1) @@ -634,27 +634,27 @@ /obj/item/reagent_containers/food/snacks/canned_jellyfish name = "canned gunner jellyfish" desc = "A can of gunner jellyfish packed in brine. Contains a mild hallucinogen which is destroyed by cooking." - icon = 'modular_nostra/icons/obj/lizards/canned.dmi' + icon = 'modular_nostra/icons/obj/food/canned.dmi' icon_state = "canned_jellyfish" list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/toxin/mindbreaker = 2, /datum/reagent/consumable/sodiumchloride = 1) tastes = list("slime" = 1, "burning" = 1, "sodiumchloride" = 1) foodtype = SEAFOOD | GROSS w_class = WEIGHT_CLASS_SMALL -/obj/item/reagent_containers/food/snacks/desert_snails +/obj/item/reagent_containers/food/snacks/canned_desert_snails name = "canned desert snails" desc = "Giant snails from the Tiziran desert, packaged in brine. Shells included. Probably best not eaten raw, unless you're a lizard." - icon = 'modular_nostra/icons/obj/lizards/canned.dmi' + icon = 'modular_nostra/icons/obj/food/canned.dmi' icon_state = "canned_snails" list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/sodiumchloride = 2) tastes = list("snails" = 1) foodtype = MEAT | GROSS w_class = WEIGHT_CLASS_SMALL -/obj/item/reagent_containers/food/snacks/larvae +/obj/item/reagent_containers/food/snacks/canned_larvae name = "canned bee larva" desc = "A can of bee larva packaged in honey. Probably appetizing to someone." - icon = 'modular_nostra/icons/obj/lizards/canned.dmi' + icon = 'modular_nostra/icons/obj/food/canned.dmi' icon_state = "canned_larvae" list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/honey = 2) tastes = list("sweet bugs" = 1) diff --git a/modular_nostra/code/modules/food_and_drinks/food/lizards/recipes_lizard.dm b/modular_nostra/code/modules/food_and_drinks/food/lizards/recipes_lizard.dm index fb173482271..00cf0af922a 100644 --- a/modular_nostra/code/modules/food_and_drinks/food/lizards/recipes_lizard.dm +++ b/modular_nostra/code/modules/food_and_drinks/food/lizards/recipes_lizard.dm @@ -65,7 +65,7 @@ /datum/crafting_recipe/food/lizard_escargot name = "Desert snail cocleas" reqs = list( - /obj/item/reagent_containers/food/snacks/desert_snails = 1, + /obj/item/reagent_containers/food/snacks/canned_desert_snails = 1, /obj/item/reagent_containers/food/snacks/grown/garlic = 1, /datum/reagent/consumable/lemonjuice = 3, /datum/reagent/consumable/blackpepper = 2, @@ -129,7 +129,7 @@ /datum/crafting_recipe/food/nectar_larvae name = "Nectar larvae" reqs = list( - /obj/item/reagent_containers/food/snacks/larvae = 1, + /obj/item/reagent_containers/food/snacks/canned_larvae = 1, /obj/item/reagent_containers/food/snacks/grown/tomato = 1, /obj/item/reagent_containers/food/snacks/grown/chili = 1, /datum/reagent/consumable/korta_nectar = 5 @@ -185,7 +185,7 @@ /datum/crafting_recipe/food/snail_nizaya name = "Desert snail nizaya" reqs = list( - /obj/item/reagent_containers/food/snacks/desert_snails = 1, + /obj/item/reagent_containers/food/snacks/canned_desert_snails = 1, /obj/item/reagent_containers/food/snacks/spaghetti/nizaya = 1, /obj/item/reagent_containers/food/snacks/grown/garlic = 1, /datum/reagent/consumable/ethanol/wine = 5 diff --git a/modular_nostra/code/modules/food_and_drinks/food/snacks_eggs.dm b/modular_nostra/code/modules/food_and_drinks/food/snacks_eggs.dm index 25d9dc176e1..df2c5dff039 100644 --- a/modular_nostra/code/modules/food_and_drinks/food/snacks_eggs.dm +++ b/modular_nostra/code/modules/food_and_drinks/food/snacks_eggs.dm @@ -2,7 +2,7 @@ name = "black egg" desc = "A finally shaped black egg, that seems to rattle to the touch." icon_state = "blackegg" - icon = 'modular_nostra/icons/obj/food.dmi' + icon = 'modular_nostra/icons/obj/food/food.dmi' throwforce = 10 list_reagents = list(/datum/reagent/consumable/eggyolk = 5) //cooked_type = /obj/item/reagent_containers/food/snacks/boiledegg diff --git a/modular_nostra/code/modules/food_and_drinks/food/snacks_pizza.dm b/modular_nostra/code/modules/food_and_drinks/food/snacks_pizza.dm index f1a58936581..db63d52b01f 100644 --- a/modular_nostra/code/modules/food_and_drinks/food/snacks_pizza.dm +++ b/modular_nostra/code/modules/food_and_drinks/food/snacks_pizza.dm @@ -1,5 +1,5 @@ /obj/item/reagent_containers/food/snacks/pizza/blackolive - icon = 'modular_nostra/icons/obj/pizzaspaghetti.dmi' + icon = 'modular_nostra/icons/obj/food/pizzaspaghetti.dmi' name = "black olive pizza" desc = "A delicious black olive pizza." icon_state = "pizzablackolive" @@ -15,13 +15,13 @@ name = "black olive pizza slice" desc = "A slice of delicious black olive pizza." icon_state = "pizzablackoliveslice" - icon = 'modular_nostra/icons/obj/pizzaspaghetti.dmi' + icon = 'modular_nostra/icons/obj/food/pizzaspaghetti.dmi' filling_color = "#FFA500" tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "olive" = 1 , "oil" = 1) foodtype = GRAIN | VEGETABLES /obj/item/reagent_containers/food/snacks/pizza/greenolive - icon = 'modular_nostra/icons/obj/pizzaspaghetti.dmi' + icon = 'modular_nostra/icons/obj/food/pizzaspaghetti.dmi' name = "green olive pizza" desc = "A more sinister green olive pizza." icon_state = "pizzagreenolive" @@ -38,7 +38,7 @@ name = "green olive pizza slice" desc = "A more sinister green olive pizza slice." icon_state = "pizzagreenoliveslice" - icon = 'modular_nostra/icons/obj/pizzaspaghetti.dmi' + icon = 'modular_nostra/icons/obj/food/pizzaspaghetti.dmi' filling_color = "#FFA500" bonus_reagents = list(/datum/reagent/toxin/sinistatia = 1) list_reagents = list(/datum/reagent/toxin/sinistatia = 1) diff --git a/modular_nostra/code/modules/hydroponics/grown/misc.dm b/modular_nostra/code/modules/hydroponics/grown/misc.dm index 3e2b6f67287..1ba8aa10538 100644 --- a/modular_nostra/code/modules/hydroponics/grown/misc.dm +++ b/modular_nostra/code/modules/hydroponics/grown/misc.dm @@ -2,7 +2,7 @@ /obj/item/seeds/syndieseeds name = "pack of suspicious seeds" desc = "These seeds grow..." - icon = 'modular_nostra/icons/obj/seeds.dmi' + icon = 'modular_nostra/icons/obj/hydroponics/seeds.dmi' icon_state = "seed-syndiefruit" species = "unusual plant" plantname = "unusual plant" @@ -22,7 +22,7 @@ /obj/item/reagent_containers/food/snacks/grown/shell/syndieseeds seed = /obj/item/seeds/syndieseeds - icon = 'modular_nostra/icons/obj/harvest.dmi' + icon = 'modular_nostra/icons/obj/hydroponics/harvest.dmi' name = "unusual fruit" desc = "It smells like sourness and lead." icon_state = "unusualfruit" @@ -36,7 +36,7 @@ name = "pack of aloevereturn seeds" desc = "These seeds grow boomerang shaped leafs." icon_state = "seed-aloevereturn" - icon = 'modular_nostra/icons/obj/seeds.dmi' + icon = 'modular_nostra/icons/obj/hydroponics/seeds.dmi' species = "aloe" plantname = "Aloevereturn" product = /obj/item/reagent_containers/food/snacks/grown/aloerang @@ -55,7 +55,7 @@ seed = /obj/item/seeds/aloevereturn name = "aloevereturn" desc = "A plant barbed with nettles in the shape of a boomerang, perhaps you can throw it..." - icon = 'modular_nostra/icons/obj/harvest.dmi' + icon = 'modular_nostra/icons/obj/hydroponics/harvest.dmi' icon_state = "aloevereturn" force = 5 throwforce = 15 @@ -89,7 +89,7 @@ name = "pack of olive seeds" desc = "The perfect side dish to any-course." icon_state = "seed-olive" - icon = 'modular_nostra/icons/obj/seeds.dmi' + icon = 'modular_nostra/icons/obj/hydroponics/seeds.dmi' species = "olive" plantname = "Olive Tree" product = /obj/item/reagent_containers/food/snacks/grown/olive @@ -98,7 +98,7 @@ yield = 6 instability = 40 potency = 2 - growing_icon = 'modular_nostra/icons/obj/growing_fruits.dmi' + growing_icon = 'modular_nostra/icons/obj/hydroponics/growing_fruits.dmi' icon_grow = "olive-grow" icon_harvest = "olive-harvest" icon_dead = "apple-dead" @@ -110,7 +110,7 @@ seed = /obj/item/seeds/olives name = "olive" desc = "Perfect on salads and pizza!" - icon = 'modular_nostra/icons/obj/harvest.dmi' + icon = 'modular_nostra/icons/obj/hydroponics/harvest.dmi' icon_state = "olive" filling_color = "#A4795A" bitesize = 100 @@ -137,7 +137,7 @@ seed = /obj/item/seeds/olives/green name = "green olive" desc = "The more sinister olive." - icon = 'modular_nostra/icons/obj/harvest.dmi' + icon = 'modular_nostra/icons/obj/hydroponics/harvest.dmi' icon_state = "greenolive" filling_color = "#A4795A" distill_reagent = null @@ -155,14 +155,14 @@ name = "pack of korta nut seeds" desc = "These seeds grow into korta nut bushes, native to Tizira." icon_state = "seed-korta" - icon = 'modular_nostra/icons/obj/lizards/seeds.dmi' + icon = 'modular_nostra/icons/obj/hydroponics/seeds.dmi' species = "kortanut" plantname = "Korta Nut Bush" product = /obj/item/reagent_containers/food/snacks/grown/korta_nut lifespan = 55 endurance = 35 yield = 5 - growing_icon = 'modular_nostra/icons/obj/lizards/growing_fruits.dmi' + growing_icon = 'modular_nostra/icons/obj/hydroponics/growing_fruits.dmi' icon_grow = "kortanut-grow" icon_dead = "kortanut-dead" genes = list(/datum/plant_gene/trait/repeated_harvest) @@ -174,7 +174,7 @@ name = "korta nut" desc = "A little nut of great importance. Has a peppery shell which can be ground into flour and a soft, pulpy interior that produces a milky fluid when juiced. Or you can eat them whole, as a quick snack." icon_state = "korta_nut" - icon = 'modular_nostra/icons/obj/lizards/harvest.dmi' + icon = 'modular_nostra/icons/obj/hydroponics/harvest.dmi' foodtype = NUTS grind_results = list(/datum/reagent/consumable/korta_flour = 0.2) juice_results = list(/datum/reagent/consumable/korta_milk = 0.2) @@ -186,7 +186,7 @@ name = "pack of sweet korta nut seeds" desc = "These seeds grow into sweet korta nuts, a mutation of the original species that produces a thick syrup that Tizirans use for desserts." icon_state = "seed-sweetkorta" - icon = 'modular_nostra/icons/obj/lizards/seeds.dmi' + icon = 'modular_nostra/icons/obj/hydroponics/seeds.dmi' species = "kortanut" plantname = "Sweet Korta Nut Bush" product = /obj/item/reagent_containers/food/snacks/grown/korta_nut/sweet @@ -200,7 +200,7 @@ seed = /obj/item/seeds/korta_nut/sweet name = "sweet korta nut" desc = "A sweet treat lizards love to eat." - icon = 'modular_nostra/icons/obj/lizards/harvest.dmi' + icon = 'modular_nostra/icons/obj/hydroponics/harvest.dmi' icon_state = "korta_nut" grind_results = list(/datum/reagent/consumable/korta_flour = 0.2) juice_results = list(/datum/reagent/consumable/korta_milk = 0.2, /datum/reagent/consumable/korta_nectar = 0.2) @@ -233,7 +233,7 @@ name = "pack of kronkus seeds" desc = "A pack of highly illegal kronkus seeds.\nPossession of these seeds carries the death penalty in 7 sectors." icon_state = "seed-kronkus" - icon = 'modular_nostra/icons/obj/lizards/seeds.dmi' + icon = 'modular_nostra/icons/obj/hydroponics/seeds.dmi' species = "kronkus" plantname = "Kronkus Vine" product = /obj/item/reagent_containers/food/snacks/grown/kronkus @@ -244,7 +244,7 @@ production = 4 yield = 3 growthstages = 3 - growing_icon = 'modular_nostra/icons/obj/lizards/growing.dmi' + growing_icon = 'modular_nostra/icons/obj/hydroponics/growing.dmi' reagents_add = list(/datum/reagent/consumable/nutriment = 0.05) /obj/item/reagent_containers/food/snacks/grown/kronkus @@ -252,7 +252,7 @@ name = "kronkus vine segment" desc = "A piece of mature kronkus vine. It exudes a sharp and noxious odor." icon_state = "kronkus" - icon = 'modular_nostra/icons/obj/lizards/harvest.dmi' + icon = 'modular_nostra/icons/obj/hydroponics/harvest.dmi' filling_color = "#37946e" foodtype = VEGETABLES | TOXIC distill_reagent = /datum/reagent/kronkus_extract @@ -274,13 +274,13 @@ name = "pack of barrelmelon seeds" desc = "These seeds grow into barrelmelon plants." icon_state = "seed-barrelmelon" - icon = 'modular_nostra/icons/obj/lizards/seeds.dmi' + icon = 'modular_nostra/icons/obj/hydroponics/seeds.dmi' species = "barrelmelon" plantname = "Barrel Melon Vines" product = /obj/item/reagent_containers/food/snacks/grown/barrelmelon genes = list(/datum/plant_gene/trait/brewing) mutatelist = null - growing_icon = 'modular_nostra/icons/obj/lizards/growing_fruits.dmi' + growing_icon = 'modular_nostra/icons/obj/hydroponics/growing_fruits.dmi' reagents_add = list(/datum/reagent/consumable/ethanol/ale = 0.2, /datum/reagent/consumable/nutriment = 0.1) rarity = 10 @@ -290,5 +290,5 @@ name = "barrelmelon" desc = "The nutriments within this melon have been compressed and fermented into rich alcohol." icon_state = "barrelmelon" - icon = 'modular_nostra/icons/obj/lizards/harvest.dmi' + icon = 'modular_nostra/icons/obj/hydroponics/harvest.dmi' distill_reagent = /datum/reagent/medicine/antihol //You can call it a integer overflow. diff --git a/modular_nostra/code/modules/vehicles/speedbike.dm b/modular_nostra/code/modules/vehicles/speedbike.dm new file mode 100644 index 00000000000..ba2510f9ee7 --- /dev/null +++ b/modular_nostra/code/modules/vehicles/speedbike.dm @@ -0,0 +1,25 @@ +//The Law +/obj/vehicle/ridden/space/thelawspeedbike + name = "The Law" + icon = 'icons/obj/bike.dmi' + icon_state = "speedbike_blue" + layer = LYING_MOB_LAYER + var/overlay_state = "cover_blue" + var/mutable_appearance/overlay + +/obj/vehicle/ridden/space/thelawspeedbike/Initialize() + . = ..() + overlay = mutable_appearance(icon, overlay_state, ABOVE_MOB_LAYER) + add_overlay(overlay) + var/datum/component/riding/D = LoadComponent(/datum/component/riding) + D.set_riding_offsets(RIDING_OFFSET_ALL, list(TEXT_NORTH = list(0, -8), TEXT_SOUTH = list(0, 4), TEXT_EAST = list(-10, 5), TEXT_WEST = list( 10, 5))) + D.vehicle_move_delay = 2 + D.set_vehicle_dir_offsets(NORTH, -16, -16) + D.set_vehicle_dir_offsets(SOUTH, -16, -16) + D.set_vehicle_dir_offsets(EAST, -18, 0) + D.set_vehicle_dir_offsets(WEST, -18, 0) + +/obj/vehicle/ridden/space/thelawspeedbike/Move(newloc,move_dir) + if(has_buckled_mobs()) + new /obj/effect/temp_visual/dir_setting/speedbike_trail(loc,move_dir) + . = ..() diff --git a/modular_nostra/code/modules/vending/wardrobes.dm b/modular_nostra/code/modules/vending/wardrobes.dm index d14f276de22..635c1adabdd 100644 --- a/modular_nostra/code/modules/vending/wardrobes.dm +++ b/modular_nostra/code/modules/vending/wardrobes.dm @@ -1,3 +1,4 @@ /obj/machinery/vending/wardrobe/science_wardrobe/Initialize() + products[/obj/item/storage/backpack/duffelbag/sci] = 3 + products = sort_list(products, /proc/cmp_typepaths_dsc) . = ..() - products += /obj/item/storage/backpack/duffelbag/sci = 3 diff --git a/modular_nostra/icons/mob/inhands/weapons/polearm_lefthand.dmi b/modular_nostra/icons/mob/inhands/weapons/polearm_lefthand.dmi deleted file mode 100644 index da12387a063..00000000000 Binary files a/modular_nostra/icons/mob/inhands/weapons/polearm_lefthand.dmi and /dev/null differ diff --git a/modular_nostra/icons/mob/inhands/weapons/polearm_righthand.dmi b/modular_nostra/icons/mob/inhands/weapons/polearm_righthand.dmi deleted file mode 100644 index 8e582bee087..00000000000 Binary files a/modular_nostra/icons/mob/inhands/weapons/polearm_righthand.dmi and /dev/null differ diff --git a/modular_nostra/icons/mob/inhands/weapons/polearms_lefthand.dmi b/modular_nostra/icons/mob/inhands/weapons/polearms_lefthand.dmi new file mode 100644 index 00000000000..55f40c59e38 Binary files /dev/null and b/modular_nostra/icons/mob/inhands/weapons/polearms_lefthand.dmi differ diff --git a/modular_nostra/icons/mob/inhands/weapons/polearms_righthand.dmi b/modular_nostra/icons/mob/inhands/weapons/polearms_righthand.dmi new file mode 100644 index 00000000000..648930a0b7b Binary files /dev/null and b/modular_nostra/icons/mob/inhands/weapons/polearms_righthand.dmi differ diff --git a/modular_nostra/icons/obj/clothing/suits.dmi b/modular_nostra/icons/obj/clothing/suits.dmi index 2391d3f3ab3..860c12321c7 100644 Binary files a/modular_nostra/icons/obj/clothing/suits.dmi and b/modular_nostra/icons/obj/clothing/suits.dmi differ diff --git a/modular_nostra/icons/obj/food.dmi b/modular_nostra/icons/obj/food.dmi deleted file mode 100644 index e145b1e2911..00000000000 Binary files a/modular_nostra/icons/obj/food.dmi and /dev/null differ diff --git a/modular_nostra/icons/obj/food/canned.dmi b/modular_nostra/icons/obj/food/canned.dmi new file mode 100644 index 00000000000..ad7001c1e3f Binary files /dev/null and b/modular_nostra/icons/obj/food/canned.dmi differ diff --git a/modular_nostra/icons/obj/food/food.dmi b/modular_nostra/icons/obj/food/food.dmi new file mode 100644 index 00000000000..4347fa82d92 Binary files /dev/null and b/modular_nostra/icons/obj/food/food.dmi differ diff --git a/modular_nostra/icons/obj/pizzaspaghetti.dmi b/modular_nostra/icons/obj/food/pizzaspaghetti.dmi similarity index 100% rename from modular_nostra/icons/obj/pizzaspaghetti.dmi rename to modular_nostra/icons/obj/food/pizzaspaghetti.dmi diff --git a/modular_nostra/icons/obj/growing_fruits.dmi b/modular_nostra/icons/obj/growing_fruits.dmi deleted file mode 100644 index 76a79246ced..00000000000 Binary files a/modular_nostra/icons/obj/growing_fruits.dmi and /dev/null differ diff --git a/modular_nostra/icons/obj/harvest.dmi b/modular_nostra/icons/obj/harvest.dmi deleted file mode 100644 index 1b1a82d70ec..00000000000 Binary files a/modular_nostra/icons/obj/harvest.dmi and /dev/null differ diff --git a/modular_nostra/icons/obj/hydroponics/growing.dmi b/modular_nostra/icons/obj/hydroponics/growing.dmi new file mode 100644 index 00000000000..b63e1769301 Binary files /dev/null and b/modular_nostra/icons/obj/hydroponics/growing.dmi differ diff --git a/modular_nostra/icons/obj/hydroponics/growing_fruits.dmi b/modular_nostra/icons/obj/hydroponics/growing_fruits.dmi new file mode 100644 index 00000000000..3fbaf2ab237 Binary files /dev/null and b/modular_nostra/icons/obj/hydroponics/growing_fruits.dmi differ diff --git a/modular_nostra/icons/obj/hydroponics/harvest.dmi b/modular_nostra/icons/obj/hydroponics/harvest.dmi new file mode 100644 index 00000000000..b84b1223e69 Binary files /dev/null and b/modular_nostra/icons/obj/hydroponics/harvest.dmi differ diff --git a/modular_nostra/icons/obj/hydroponics/seeds.dmi b/modular_nostra/icons/obj/hydroponics/seeds.dmi new file mode 100644 index 00000000000..c7e2a283444 Binary files /dev/null and b/modular_nostra/icons/obj/hydroponics/seeds.dmi differ diff --git a/modular_nostra/icons/obj/lizard_food.dmi b/modular_nostra/icons/obj/lizard_food.dmi deleted file mode 100644 index 25ea72ec4a2..00000000000 Binary files a/modular_nostra/icons/obj/lizard_food.dmi and /dev/null differ diff --git a/modular_nostra/icons/obj/lizards/canned.dmi b/modular_nostra/icons/obj/lizards/canned.dmi deleted file mode 100644 index 73a90b8c54f..00000000000 Binary files a/modular_nostra/icons/obj/lizards/canned.dmi and /dev/null differ diff --git a/modular_nostra/icons/obj/lizards/growing.dmi b/modular_nostra/icons/obj/lizards/growing.dmi deleted file mode 100644 index 9cf8169eee4..00000000000 Binary files a/modular_nostra/icons/obj/lizards/growing.dmi and /dev/null differ diff --git a/modular_nostra/icons/obj/lizards/growing_flowers.dmi b/modular_nostra/icons/obj/lizards/growing_flowers.dmi deleted file mode 100644 index c9bb7eeaacd..00000000000 Binary files a/modular_nostra/icons/obj/lizards/growing_flowers.dmi and /dev/null differ diff --git a/modular_nostra/icons/obj/lizards/growing_fruits.dmi b/modular_nostra/icons/obj/lizards/growing_fruits.dmi deleted file mode 100644 index e166d5c1ba3..00000000000 Binary files a/modular_nostra/icons/obj/lizards/growing_fruits.dmi and /dev/null differ diff --git a/modular_nostra/icons/obj/lizards/growing_mushrooms.dmi b/modular_nostra/icons/obj/lizards/growing_mushrooms.dmi deleted file mode 100644 index 1e1b243ca03..00000000000 Binary files a/modular_nostra/icons/obj/lizards/growing_mushrooms.dmi and /dev/null differ diff --git a/modular_nostra/icons/obj/lizards/growing_vegetables.dmi b/modular_nostra/icons/obj/lizards/growing_vegetables.dmi deleted file mode 100644 index bac07898c99..00000000000 Binary files a/modular_nostra/icons/obj/lizards/growing_vegetables.dmi and /dev/null differ diff --git a/modular_nostra/icons/obj/lizards/harvest.dmi b/modular_nostra/icons/obj/lizards/harvest.dmi deleted file mode 100644 index af98f41751f..00000000000 Binary files a/modular_nostra/icons/obj/lizards/harvest.dmi and /dev/null differ diff --git a/modular_nostra/icons/obj/lizards/seeds.dmi b/modular_nostra/icons/obj/lizards/seeds.dmi deleted file mode 100644 index 616978c6dcb..00000000000 Binary files a/modular_nostra/icons/obj/lizards/seeds.dmi and /dev/null differ diff --git a/modular_nostra/icons/obj/polearms_lefthand.dmi b/modular_nostra/icons/obj/polearms_lefthand.dmi deleted file mode 100644 index bb16c7b294d..00000000000 Binary files a/modular_nostra/icons/obj/polearms_lefthand.dmi and /dev/null differ diff --git a/modular_nostra/icons/obj/polearms_righthand.dmi b/modular_nostra/icons/obj/polearms_righthand.dmi deleted file mode 100644 index 0dbbf665f5d..00000000000 Binary files a/modular_nostra/icons/obj/polearms_righthand.dmi and /dev/null differ diff --git a/modular_nostra/icons/obj/seeds.dmi b/modular_nostra/icons/obj/seeds.dmi deleted file mode 100644 index d1d2f23f804..00000000000 Binary files a/modular_nostra/icons/obj/seeds.dmi and /dev/null differ diff --git a/modular_nostra/icons/obj/suits.dmi b/modular_nostra/icons/obj/suits.dmi deleted file mode 100644 index ade504924ed..00000000000 Binary files a/modular_nostra/icons/obj/suits.dmi and /dev/null differ diff --git a/tgstation.dme b/tgstation.dme index b56f6ceebd0..d75fd5731fb 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -4015,6 +4015,7 @@ #include "modular_nostra\code\__DEFINES\DNA.dm" #include "modular_nostra\code\__DEFINES\melee.dm" #include "modular_nostra\code\__DEFINES\dcs\signals.dm" +#include "modular_nostra\code\__HELPERS\cmp.dm" #include "modular_nostra\code\__HELPERS\string_lists.dm" #include "modular_nostra\code\__HELPERS\unsorted.dm" #include "modular_nostra\code\controllers\subsystem\bluespace_locker.dm" @@ -4028,6 +4029,8 @@ #include "modular_nostra\code\datums\martial\cat_fight.dm" #include "modular_nostra\code\datums\martial\goo_fu.dm" #include "modular_nostra\code\datums\martial\tribal_claw.dm" +#include "modular_nostra\code\datums\ruins\space.dm" +#include "modular_nostra\code\datums\ruins\lavaland.dm" #include "modular_nostra\code\game\area\areas.dm" #include "modular_nostra\code\game\area\Space_Station_13_areas.dm" #include "modular_nostra\code\game\machinery\syndicatebeacon.dm" @@ -4038,8 +4041,8 @@ #include "modular_nostra\code\game\objects\items\murasama.dm" #include "modular_nostra\code\game\objects\items\plushes.dm" #include "modular_nostra\code\game\objects\items\polearms.dm" -#include "modular_nostra\code\game\objects\items\RPD.dm" #include "modular_nostra\code\game\objects\items\RCD.dm" +#include "modular_nostra\code\game\objects\items\RPD.dm" #include "modular_nostra\code\game\objects\items\spears.dm" #include "modular_nostra\code\game\objects\items\weaponry.dm" #include "modular_nostra\code\game\objects\items\devices\flashlight.dm" @@ -4057,6 +4060,7 @@ #include "modular_nostra\code\modules\cargo\packs\emergency.dm" #include "modular_nostra\code\modules\cargo\supply_pack\lizard_crates.dm" #include "modular_nostra\code\modules\client\preferences_toggles.dm" +#include "modular_nostra\code\modules\clothing\outfits\standard.dm" #include "modular_nostra\code\modules\clothing\suits\armor.dm" #include "modular_nostra\code\modules\clothing\suits\mgr.dm" #include "modular_nostra\code\modules\clothing\suits\miscellaneous.dm" @@ -4109,6 +4113,8 @@ #include "modular_nostra\code\modules\uplink\uplink_items\uplink_dangerous.dm" #include "modular_nostra\code\modules\uplink\uplink_items\uplink_roles.dm" #include "modular_nostra\code\modules\uplink\uplink_items\uplink_stealth.dm" +#include "modular_nostra\code\modules\vehicles\speedbike.dm" +#include "modular_nostra\code\modules\vending\wardrobes.dm" #include "modular_sand\code\_globalvars\bitfields.dm" #include "modular_sand\code\_globalvars\lists\lewd_content.dm" #include "modular_sand\code\_globalvars\lists\misc.dm"