diff --git a/code/datums/autolathe/arms_yw.dm b/code/datums/autolathe/arms_yw.dm new file mode 100644 index 0000000000..1d102f9d87 --- /dev/null +++ b/code/datums/autolathe/arms_yw.dm @@ -0,0 +1,4 @@ +/datum/category_item/autolathe/arms/shotgun_scatter + name = "ammunition (12g scatter)" + path =/obj/item/ammo_casing/a12g/scatter + hidden = 1 diff --git a/code/modules/client/preference_setup/loadout/loadout_fluffitems_yw.dm b/code/modules/client/preference_setup/loadout/loadout_fluffitems_yw.dm index c8c8d5e6ee..11c4082794 100644 --- a/code/modules/client/preference_setup/loadout/loadout_fluffitems_yw.dm +++ b/code/modules/client/preference_setup/loadout/loadout_fluffitems_yw.dm @@ -893,6 +893,12 @@ character_name = list("Aroozee Daarvoleast-Clark") allowed_roles = list("Head of Security") +/datum/gear/fluff/aroozee_valhollide_ring + path = /obj/item/clothing/accessory/collar/fluff/aroozee_valhollide_ring + display_name = "Aroozee valhollide ring" + description = "A ring made of valhollide." + ckeywhitelist = list("splintergp") + character_name = list("Aroozee Daarvoleast-Clark") // T CKEYS diff --git a/code/modules/clothing/suits/armor_yw.dm b/code/modules/clothing/suits/armor_yw.dm index 345ef2fdd9..8f63a6961e 100644 --- a/code/modules/clothing/suits/armor_yw.dm +++ b/code/modules/clothing/suits/armor_yw.dm @@ -20,6 +20,32 @@ armor = list(melee = 15, bullet = 10, laser = 15, energy = 5, bomb = 15, bio = 0, rad = 0) cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS heat_protection = UPPER_TORSO|LOWER_TORSO|ARMS + flags_inv = HIDEHOLSTER + open = 1 + + toggle() + set name = "Toggle Coat Buttons" + set category = "Object" + set src in usr + if(!usr.canmove || usr.stat || usr.restrained()) + return 0 + + if(open == 1) //Will check whether icon state is currently set to the "open" or "closed" state and switch it around with a message to the user + open = 0 + icon_state = "secjacket" + item_state = "secjacket_s" + flags_inv = HIDETIE|HIDEHOLSTER + to_chat(usr, "You button up the coat.") + else if(open == 0) + open = 1 + icon_state = "secjacket_open" + item_state = "secjacket_open_s" + flags_inv = HIDEHOLSTER + to_chat(usr, "You unbutton the coat.") + else //in case some goofy admin switches icon states around without switching the icon_open or icon_closed + to_chat(usr, "You attempt to button-up the velcro on your [src], before promptly realising how silly you are.") + return + update_clothing_icon() //so our overlays update /obj/item/clothing/suit/armor/yw/blueshieldcoat name = "Blue Shield Security Coat" @@ -49,5 +75,5 @@ icon = 'icons/mob/suit_yw.dmi' icon_state = "paramedic-vest" icon_override = 'icons/mob/suit_yw.dmi' - item_state = "paramedic-vest_us" + item_state = "paramedic-vest_s" armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 15, bio = 50, rad = 50) \ No newline at end of file diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 72950d241c..8c48b1fbcb 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -234,6 +234,11 @@ icon_state = "straight_jacket" body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL|HIDETIE|HIDEHOLSTER + //yw edit - Teshari sprite + sprite_sheets = list( + SPECIES_TESHARI = 'icons/vore/custom_onmob_yw.dmi' + ) + //yw edit end var/resist_time = 4800 // Eight minutes. diff --git a/code/modules/clothing/suits/storage_yw.dm b/code/modules/clothing/suits/storage_yw.dm index 959faadc50..21e0fdadb6 100644 --- a/code/modules/clothing/suits/storage_yw.dm +++ b/code/modules/clothing/suits/storage_yw.dm @@ -58,18 +58,20 @@ /obj/item/clothing/suit/storage/tailcoat name = "victorian tailcoat" desc = "A fancy victorian tailcoat." + icon = 'icons/mob/suit_yw.dmi' icon_state = "tailcoat" icon_override = 'icons/mob/suit_yw.dmi' - item_state = "tailcoat" + item_state = "tailcoat_s" /obj/item/clothing/suit/storage/victcoat name = "ladies black victorian coat" desc = "A fancy victorian coat." + icon = 'icons/mob/suit_yw.dmi' icon_state = "ladiesvictoriancoat" icon_override = 'icons/mob/suit_yw.dmi' - item_state = "ladiesvictoriancoat" + item_state = "ladiesvictoriancoat_s" /obj/item/clothing/suit/storage/victcoat/red name = "ladies red victorian coat" icon_state = "ladiesredvictoriancoat" - item_state = "ladiesredvictoriancoat" \ No newline at end of file + item_state = "ladiesredvictoriancoat_s" \ No newline at end of file diff --git a/code/modules/projectiles/guns/projectile/shotgun_yw.dm b/code/modules/projectiles/guns/projectile/shotgun_yw.dm index eb806a4b98..cae96986f8 100644 --- a/code/modules/projectiles/guns/projectile/shotgun_yw.dm +++ b/code/modules/projectiles/guns/projectile/shotgun_yw.dm @@ -50,4 +50,36 @@ /obj/item/ammo_magazine/m12gdrumjack/empty name = "drum magazine (12 gauge)" - initial_ammo = 0 \ No newline at end of file + initial_ammo = 0 + +//scattering shots, old buckshot +/obj/item/ammo_casing/a12g/scatter + name = "scatter shell" + desc = "A 12 gauge scattering shell" + icon = 'icons/obj/ammo_yw.dmi' + icon_state = "scattershell" + projectile_type = /obj/item/projectile/scatter/shotgun + +/obj/item/projectile/scatter/shotgun + name = "Shotgun scatter projectile" + spread_submunition_damage = FALSE + submunition_spread_max = 60 + submunition_spread_min = 50 + submunitions = list( + /obj/item/projectile/bullet/shotgun/scatterprojectile = 6 + ) +/obj/item/projectile/bullet/shotgun/scatterprojectile + name = "pellet" + fire_sound = 'sound/weapons/Gunshot_shotgun.ogg' + damage = 13 + +/obj/item/weapon/storage/box/scattershot + name = "box of shotgun scatter shells" + desc = "It has a picture of a gun and several warning symbols on the front.
WARNING: Live ammunition. Misuse may result in serious injury or death." + icon = 'icons/obj/ammo_yw.dmi' + icon_state = "scattershot_box" + item_state_slots = list(slot_r_hand_str = "syringe_kit", slot_l_hand_str = "syringe_kit") + starts_with = list(/obj/item/ammo_casing/a12g/scatter = 8) + +/obj/item/weapon/storage/box/scattershot/large + starts_with = list(/obj/item/ammo_casing/a12g/scatter = 16) \ No newline at end of file diff --git a/code/modules/vore/appearance/spider_taur_powers_vr.dm b/code/modules/vore/appearance/spider_taur_powers_vr.dm index e0ca52b711..b66026b2da 100644 --- a/code/modules/vore/appearance/spider_taur_powers_vr.dm +++ b/code/modules/vore/appearance/spider_taur_powers_vr.dm @@ -21,6 +21,15 @@ body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL +//yw edit start - Teshari Sprite +/obj/item/clothing/suit/straight_jacket/web_bindings/get_worn_icon_file(var/body_type,var/slot_name,var/default_icon,var/inhands) + if(body_type == SPECIES_TESHARI) + if(!inhands) + return 'icons/vore/custom_onmob_yw.dmi' + else + return ..() +//yw edit end + /* //Commenting all this out, as people keep abusing it. Sorry! mob/proc/weaveWeb() set name = "Weave Web" @@ -45,3 +54,4 @@ mob/proc/weaveWeb() src.put_in_hands(bindings) else to_chat(src, "You do not have enough nutrition to create webbing!") //CK~ + diff --git a/code/modules/vore/fluffstuff/custom_clothes_yw.dm b/code/modules/vore/fluffstuff/custom_clothes_yw.dm index cd972145d2..8ab2562dff 100644 --- a/code/modules/vore/fluffstuff/custom_clothes_yw.dm +++ b/code/modules/vore/fluffstuff/custom_clothes_yw.dm @@ -1637,6 +1637,16 @@ cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE +/obj/item/clothing/accessory/collar/fluff/aroozee_valhollide_ring + name = "Aroozee valhollide ring" + desc = "A long, loose chain lace of silver, holding a special ring of a perfect, crystalline definition.
It's touch is perpetually that of deep ice-cold, no matter how long you hold it.
Staring at it, you feel quiet, your mind calm, your thoughts very still." + icon = 'icons/vore/custom_clothes_yw.dmi' + icon_state = "aroozee_valhollide_ring" + icon_override = 'icons/vore/custom_clothes_yw.dmi' + item_state = "aroozee_valhollide_ring_mob" + overlay_state = "aroozee_valhollide_ring_mob" + slot_flags = SLOT_TIE | SLOT_OCLOTHING + w_class = 2 // ***** diff --git a/icons/mob/species/grey/helmet.dmi b/icons/mob/species/grey/helmet.dmi index 2efb3a54d9..9b522be1e3 100644 Binary files a/icons/mob/species/grey/helmet.dmi and b/icons/mob/species/grey/helmet.dmi differ diff --git a/icons/mob/suit_yw.dmi b/icons/mob/suit_yw.dmi index f09a6f8287..fc3acad71f 100644 Binary files a/icons/mob/suit_yw.dmi and b/icons/mob/suit_yw.dmi differ diff --git a/icons/obj/ammo_yw.dmi b/icons/obj/ammo_yw.dmi index 829502a07a..fd013b09a7 100644 Binary files a/icons/obj/ammo_yw.dmi and b/icons/obj/ammo_yw.dmi differ diff --git a/icons/vore/custom_clothes_yw.dmi b/icons/vore/custom_clothes_yw.dmi index df650de8db..acfc8d368b 100644 Binary files a/icons/vore/custom_clothes_yw.dmi and b/icons/vore/custom_clothes_yw.dmi differ diff --git a/icons/vore/custom_onmob_yw.dmi b/icons/vore/custom_onmob_yw.dmi index b76ed0338a..46fa0287a0 100644 Binary files a/icons/vore/custom_onmob_yw.dmi and b/icons/vore/custom_onmob_yw.dmi differ diff --git a/maps/yw/cryogaia_defines.dm b/maps/yw/cryogaia_defines.dm index 1f1ebc9b70..dfee37cc4f 100644 --- a/maps/yw/cryogaia_defines.dm +++ b/maps/yw/cryogaia_defines.dm @@ -163,6 +163,8 @@ lateload_single_pick = null //Nothing right now. + planet_datums_to_make = list(/datum/planet/borealis2) + /datum/map/cryogaia/perform_map_generation() new /datum/random_map/automata/cave_system/no_cracks(null, 1, 1, Z_LEVEL_CRYOGAIA_MINE, world.maxx, world.maxy) // Create the mining Z-level. diff --git a/news_articles/the_sleepy_sergal_2.html b/news_articles/the_sleepy_sergal_2.html index 8a11bf97d2..be76490ed9 100644 --- a/news_articles/the_sleepy_sergal_2.html +++ b/news_articles/the_sleepy_sergal_2.html @@ -159,3 +159,20 @@ Most of the workforce from those areas have been relocated to other sectors.

Writer(s)

DeepIndigo

+ +
+ +

The Sleepy Sergal - 1/15/2564

+

===Strange phenomena from around NT space! (powered by NanoTrasen)===

+ +

A series of bizarre events reported from around the holdings. A detailed report on this one, as well as several not included here, can be found on the hotlink list located at exonet address NTspacegen.phenomlist21942.ZZZSerg.NT

+ +

Plague of nightspiders: Following several days of unusual sun-blocking heavy overcast at the Borealis 1 mining and research outpost, the facility was recently sieged by a large migration of local arachniform animal species nearly ten times the population of the expected norms. Fortunately, on-site NT and externally contracted security consisting of Officers Tenali, Kurkivor Snowstrider, Joel Johnson, and Alex Maktzandt were ln-site to head up the defense. We attempted to reach each of them for comment via e-mail.

+ +

Officer Snowstrider had the following to say: "We lost a few good people who decided to recklessly charge into battle. I'm just glad we had a good few more there to back me up. Certainly was the worse wall breach I've ever seen."
+ "Command better ok my turret network idea! [The facility] would be safe from another attack like that.", said Johnson.
+ Said Tenali, "Psh, I killed like 30 of them while dragging the fools back to medical, lost count after 50. Was it stressful? Nah, I had a laser gun and 5 batteries! Certified spider slaying equipment."
+ Officer Maktzandt declined to comment.

+ +

Writer(s)

+

DeepIndigo

\ No newline at end of file diff --git a/vorestation.dme b/vorestation.dme index d1c459aec6..c5ea09da3a 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -303,6 +303,7 @@ #include "code\datums\weakref.dm" #include "code\datums\autolathe\arms.dm" #include "code\datums\autolathe\arms_vr.dm" +#include "code\datums\autolathe\arms_yw.dm" #include "code\datums\autolathe\autolathe.dm" #include "code\datums\autolathe\devices.dm" #include "code\datums\autolathe\devices_vr.dm"