diff --git a/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm b/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm index ca6895463fc9..36ce117d8417 100644 --- a/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm +++ b/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm @@ -6112,7 +6112,7 @@ /obj/item/storage/pill_bottle/aranesp, /obj/item/taperecorder, /obj/item/t_scanner, -/obj/item/switchblade, +/obj/item/kitchen/knife/switchblade, /obj/item/trash/candy, /obj/structure/filingcabinet/double, /obj/item/radio/intercom/directional/south, diff --git a/code/game/objects/items/kitchen.dm b/code/game/objects/items/kitchen.dm index e386420462d6..9e90329404f0 100644 --- a/code/game/objects/items/kitchen.dm +++ b/code/game/objects/items/kitchen.dm @@ -177,6 +177,42 @@ /obj/item/kitchen/knife/hunting/set_butchering() AddComponent(/datum/component/butchering, 80 - force, 100, force + 10) +/obj/item/kitchen/knife/switchblade + name = "switchblade" + icon_state = "switchblade" + lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi' + righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi' + desc = "A sharp, concealable, spring-loaded knife." + flags_1 = CONDUCT_1 + force = 3 + w_class = WEIGHT_CLASS_SMALL + throwforce = 5 + custom_materials = list(/datum/material/iron=12000) + hitsound = 'sound/weapons/genhit.ogg' + attack_verb = list("stubbed", "poked") + resistance_flags = FIRE_PROOF + var/extended = 0 + +/obj/item/kitchen/knife/switchblade/attack_self(mob/user) + extended = !extended + playsound(src.loc, 'sound/weapons/batonextend.ogg', 50, TRUE) + if(extended) + force = 20 + w_class = WEIGHT_CLASS_NORMAL + throwforce = 23 + icon_state = "switchblade_ext" + attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") + hitsound = 'sound/weapons/bladeslice.ogg' + sharpness = IS_SHARP + else + force = 3 + w_class = WEIGHT_CLASS_SMALL + throwforce = 5 + icon_state = "switchblade" + attack_verb = list("stubbed", "poked") + hitsound = 'sound/weapons/genhit.ogg' + sharpness = IS_BLUNT + /obj/item/kitchen/knife/combat name = "combat knife" icon = 'icons/obj/world/melee.dmi' diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm index 01307d92a0f8..d6edfb29461a 100644 --- a/code/game/objects/items/storage/fancy.dm +++ b/code/game/objects/items/storage/fancy.dm @@ -133,6 +133,29 @@ STR.max_items = 12 STR.set_holdable(list(/obj/item/reagent_containers/food/snacks/egg)) +/obj/item/storage/fancy/egg_box/update_icon_state() + . = ..() + icon_state = "[base_icon_state][is_open ? "_open" : null]" + +/obj/item/storage/fancy/egg_box/update_overlays() + . = ..() + cut_overlays() + if(!is_open) + return + var/egg_count = 0 + for(var/obj/item/reagent_containers/food/snacks/egg as anything in contents) + egg_count++ + if(!egg) + return + var/image/current_huevo = image(icon = icon, icon_state = "eggbox_eggoverlay") + if(egg_count <= 6) //less than 6 eggs + current_huevo.pixel_x = (3*(egg_count-1)) + else //if more than 6, make an extra row + current_huevo.pixel_x = (3*(egg_count-7)) //-7 to 'reset' it + current_huevo.pixel_y = -3 + add_overlay(current_huevo) + + /* * Candle Box */ diff --git a/code/game/objects/items/storage/uplink_kits.dm b/code/game/objects/items/storage/uplink_kits.dm index d91fc622cd56..702416e4202e 100644 --- a/code/game/objects/items/storage/uplink_kits.dm +++ b/code/game/objects/items/storage/uplink_kits.dm @@ -22,7 +22,7 @@ new /obj/item/multitool/ai_detect(src) // 1 tc new /obj/item/encryptionkey/syndicate(src) // 2 tc new /obj/item/reagent_containers/syringe/mulligan(src) // 4 tc - new /obj/item/switchblade(src) //I'll count this as 2 tc + new /obj/item/kitchen/knife/switchblade(src) //I'll count this as 2 tc new /obj/item/storage/fancy/cigarettes/cigpack_syndicate (src) // 2 tc this shit heals new /obj/item/flashlight/emp(src) // 2 tc new /obj/item/chameleon(src) // 7 tc @@ -195,7 +195,7 @@ if("made_man") new /obj/effect/spawner/lootdrop/mafia_outfit(src) // 0 TC, just an outfit for the new 'don of this family new /obj/item/gun/ballistic/automatic/smg/firestorm/pan(src) // 20 TC, a gun with 50 .45 bullets on a three round burst is kinda outstanding - new /obj/item/switchblade(src) // 3 TC? It's nice, but it's really a stealth/oh fuck I'm out of ammo weapon + new /obj/item/kitchen/knife/switchblade(src) // 3 TC? It's nice, but it's really a stealth/oh fuck I'm out of ammo weapon new /obj/item/reagent_containers/food/drinks/bottle/vodka (src) // 5 TC, free molotov assemblies new /obj/item/reagent_containers/food/drinks/bottle/vodka (src) new /obj/item/reagent_containers/food/drinks/bottle/vodka (src) diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm index 9e8d1e3c17b9..865ca17e7d50 100644 --- a/code/game/objects/items/weaponry.dm +++ b/code/game/objects/items/weaponry.dm @@ -350,44 +350,6 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 attack_verb = list("stabbed", "ripped", "gored", "impaled") embedding = list("pain_mult" = 8, "embed_chance" = 100, "fall_chance" = 0, "impact_pain_mult" = 15) //55 damage+embed on hit -/obj/item/switchblade - name = "switchblade" - icon_state = "switchblade" - lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi' - righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi' - desc = "A sharp, concealable, spring-loaded knife." - flags_1 = CONDUCT_1 - force = 3 - w_class = WEIGHT_CLASS_SMALL - throwforce = 5 - throw_speed = 3 - throw_range = 6 - custom_materials = list(/datum/material/iron=12000) - hitsound = 'sound/weapons/genhit.ogg' - attack_verb = list("stubbed", "poked") - resistance_flags = FIRE_PROOF - var/extended = 0 - -/obj/item/switchblade/attack_self(mob/user) - extended = !extended - playsound(src.loc, 'sound/weapons/batonextend.ogg', 50, TRUE) - if(extended) - force = 20 - w_class = WEIGHT_CLASS_NORMAL - throwforce = 23 - icon_state = "switchblade_ext" - attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") - hitsound = 'sound/weapons/bladeslice.ogg' - sharpness = IS_SHARP - else - force = 3 - w_class = WEIGHT_CLASS_SMALL - throwforce = 5 - icon_state = "switchblade" - attack_verb = list("stubbed", "poked") - hitsound = 'sound/weapons/genhit.ogg' - sharpness = IS_BLUNT - /obj/item/phone name = "red phone" desc = "Should anything ever go wrong..." diff --git a/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm b/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm index b98ca4fd8acd..616ef12ff316 100644 --- a/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm +++ b/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm @@ -38,7 +38,7 @@ /datum/blackmarket_item/weapon/switchblade name = "Switchblade" desc = "Extra shrap switchblades for intimidation AND style. Bandages not included if you cut yourself." - item = /obj/item/switchblade + item = /obj/item/kitchen/knife/switchblade price_min = 500 price_max = 700 diff --git a/code/modules/cargo/packs/costumes_toys.dm b/code/modules/cargo/packs/costumes_toys.dm index 5bce9871719a..fa63529b7955 100644 --- a/code/modules/cargo/packs/costumes_toys.dm +++ b/code/modules/cargo/packs/costumes_toys.dm @@ -115,7 +115,7 @@ if(prob(30)) //Not all mafioso have mustaches, some people also find this item annoying. new /obj/item/clothing/mask/fakemoustache/italian(C) if(prob(10)) //A little extra sugar every now and then to shake things up. - new /obj/item/switchblade(C) + new /obj/item/kitchen/knife/switchblade(C) /datum/supply_pack/costumes_toys/mech_suits name = "Mech Pilot's Suit Crate" diff --git a/code/modules/clothing/outfits/ert/nanotrasen_ert.dm b/code/modules/clothing/outfits/ert/nanotrasen_ert.dm index a541941208e2..4cec7ad56f8a 100644 --- a/code/modules/clothing/outfits/ert/nanotrasen_ert.dm +++ b/code/modules/clothing/outfits/ert/nanotrasen_ert.dm @@ -29,7 +29,7 @@ belt = /obj/item/storage/belt/security/full backpack_contents = list(/obj/item/storage/box/survival/engineer=1,\ /obj/item/melee/baton/loaded=1) - l_pocket = /obj/item/switchblade + l_pocket = /obj/item/kitchen/knife/switchblade /datum/outfit/centcom/ert/commander/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) ..() diff --git a/code/modules/clothing/outfits/factions/gezena.dm b/code/modules/clothing/outfits/factions/gezena.dm index ed32d8b698e7..df7a5145e47f 100644 --- a/code/modules/clothing/outfits/factions/gezena.dm +++ b/code/modules/clothing/outfits/factions/gezena.dm @@ -7,6 +7,7 @@ if(visualsOnly) return H.faction |= list(FACTION_PLAYER_GEZENA) + H.grant_language(/datum/language/draconic) //Playable Roles (put in ships): /datum/outfit/job/gezena/assistant diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm index e39d48e5cc77..517c8691c92d 100644 --- a/code/modules/research/designs/autolathe_designs.dm +++ b/code/modules/research/designs/autolathe_designs.dm @@ -491,6 +491,14 @@ build_path = /obj/item/shovel category = list("initial","Misc", "Tool Designs") +/datum/design/pickaxe + name = "Pickaxe" + id = "pickaxe" + build_type = AUTOLATHE | PROTOLATHE + materials = list(/datum/material/iron = 1000) + build_path = /obj/item/pickaxe + category = list("initial","Tools", "Tool Designs") + /datum/design/spade name = "Spade" id = "spade" diff --git a/html/changelogs/AutoChangeLog-pr-3083.yml b/html/changelogs/AutoChangeLog-pr-3083.yml deleted file mode 100644 index d4960c0dcfeb..000000000000 --- a/html/changelogs/AutoChangeLog-pr-3083.yml +++ /dev/null @@ -1,8 +0,0 @@ -author: Skies-Of-Blue -changes: - - {rscadd: several new SUNS-produced genemods have hit the public market! Head to - your local gene-clinic and ask about their new dog and rabbit options for more - details} - - {balance: fox ears have been tweaked to be just as susceptible to sound as cat - ears} -delete-after: true diff --git a/html/changelogs/AutoChangeLog-pr-3087.yml b/html/changelogs/AutoChangeLog-pr-3087.yml deleted file mode 100644 index 3ffd70b999fa..000000000000 --- a/html/changelogs/AutoChangeLog-pr-3087.yml +++ /dev/null @@ -1,11 +0,0 @@ -author: PositiveEntropy -changes: - - {rscadd: CLIP now reports the presence of so-called "Flame Troopers" of the Frontiersmen - terrorizing their territories...} - - {balance: Marine armor has improved armor stats at the cost of the bulk slowing - down the wearer.} - - {balance: 'Flamethrowers have a slightly improved effective range, as well as - higher damage.'} - - {imageadd: The Frontiersmen have gotten better tailors and now look sharp and - deadly!} -delete-after: true diff --git a/html/changelogs/archive/2024-06.yml b/html/changelogs/archive/2024-06.yml index 5ac112757f39..56f937d3951f 100644 --- a/html/changelogs/archive/2024-06.yml +++ b/html/changelogs/archive/2024-06.yml @@ -174,3 +174,28 @@ - rscdel: Removed 16 unused/removed ruin code files - rscdel: Removed a whole lot of old/unused ruin code from misc files - tweak: Tweaked various ruins and one ship to fix issues and remove unused items +2024-06-10: + PositiveEntropy: + - rscadd: CLIP now reports the presence of so-called "Flame Troopers" of the Frontiersmen + terrorizing their territories... + - balance: Marine armor has improved armor stats at the cost of the bulk slowing + down the wearer. + - balance: Flamethrowers have a slightly improved effective range, as well as higher + damage. + - imageadd: The Frontiersmen have gotten better tailors and now look sharp and deadly! + Skies-Of-Blue: + - rscadd: several new SUNS-produced genemods have hit the public market! Head to + your local gene-clinic and ask about their new dog and rabbit options for more + details + - balance: fox ears have been tweaked to be just as susceptible to sound as cat + ears +2024-06-11: + 'CoiledLamb ': + - rscadd: Resprites the eggbox + Gristlebee: + - code_imp: Switchblades are now pathed under obj/kitchen/knife + - imageadd: Switchblade sprites moved from items and weapons.dmi to knife.dmi + Sadhorizon: + - rscadd: Pickaxe was added to the autolathe. + meemofcourse: + - rscadd: PGF jobs now grant you the Kalixcian Common language diff --git a/icons/obj/food/containers.dmi b/icons/obj/food/containers.dmi index 118ce7693637..a200515c324f 100644 Binary files a/icons/obj/food/containers.dmi and b/icons/obj/food/containers.dmi differ diff --git a/icons/obj/item/knife.dmi b/icons/obj/item/knife.dmi index aebfb617ed34..2e95a9154512 100644 Binary files a/icons/obj/item/knife.dmi and b/icons/obj/item/knife.dmi differ diff --git a/icons/obj/items_and_weapons.dmi b/icons/obj/items_and_weapons.dmi index 12798b6eb2ac..a0ceaebd8383 100644 Binary files a/icons/obj/items_and_weapons.dmi and b/icons/obj/items_and_weapons.dmi differ