diff --git a/aurorastation.dme b/aurorastation.dme index df665eff2f5..03d835bbfc5 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -1289,6 +1289,7 @@ #include "code\modules\client\preference_setup\loadout\loadout_gloves.dm" #include "code\modules\client\preference_setup\loadout\loadout_head.dm" #include "code\modules\client\preference_setup\loadout\loadout_mask.dm" +#include "code\modules\client\preference_setup\loadout\loadout_religion.dm" #include "code\modules\client\preference_setup\loadout\loadout_shoes.dm" #include "code\modules\client\preference_setup\loadout\loadout_smoking.dm" #include "code\modules\client\preference_setup\loadout\loadout_suit.dm" diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories.dm b/code/modules/client/preference_setup/loadout/loadout_accessories.dm index 7b69d3bc284..b26c66ac753 100644 --- a/code/modules/client/preference_setup/loadout/loadout_accessories.dm +++ b/code/modules/client/preference_setup/loadout/loadout_accessories.dm @@ -262,8 +262,4 @@ /datum/gear/accessory/sleeve_patch/New() ..() - gear_tweaks += gear_tweak_free_color_choice - -/datum/gear/accessory/rosary - display_name = "rosary" - path = /obj/item/clothing/accessory/rosary \ No newline at end of file + gear_tweaks += gear_tweak_free_color_choice \ No newline at end of file diff --git a/code/modules/client/preference_setup/loadout/loadout_religion.dm b/code/modules/client/preference_setup/loadout/loadout_religion.dm new file mode 100644 index 00000000000..f97eabcb461 --- /dev/null +++ b/code/modules/client/preference_setup/loadout/loadout_religion.dm @@ -0,0 +1,20 @@ +/datum/gear/religion + display_name = "trinary perfection robes" + path = /obj/item/clothing/suit/trinary_robes + sort_category = "Religion" + +/datum/gear/religion/trinary/mask + display_name = "trinary perfection mask" + path = /obj/item/clothing/mask/trinary_mask + +/datum/gear/religion/trinary/cape + display_name = "trinary perfection cape" + path = /obj/item/clothing/accessory/poncho/trinary + +/datum/gear/religion/trinary/badge + display_name = "trinary perfection brooch" + path = /obj/item/clothing/accessory/badge/trinary + +/datum/gear/religion/rosary + display_name = "rosary" + path = /obj/item/clothing/accessory/rosary diff --git a/code/modules/client/preference_setup/loadout/loadout_suit.dm b/code/modules/client/preference_setup/loadout/loadout_suit.dm index 983b58df746..07bc43a22a9 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit.dm @@ -173,6 +173,10 @@ display_name = "winter coat" path = /obj/item/clothing/suit/storage/hooded/wintercoat +/datum/gear/suit/winter/red + display_name = "winter coat, red" + path = /obj/item/clothing/suit/storage/hooded/wintercoat/red + /datum/gear/suit/winter/captain display_name = "winter coat, captain" path = /obj/item/clothing/suit/storage/hooded/wintercoat/captain diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno/machine.dm b/code/modules/client/preference_setup/loadout/loadout_xeno/machine.dm index 83b3068d7ff..f00447836b7 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno/machine.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno/machine.dm @@ -76,6 +76,7 @@ antenna["antenna, double"] = /obj/item/clothing/head/antenna/double antenna["antenna, left"] = /obj/item/clothing/head/antenna/double/left antenna["antenna, right"] = /obj/item/clothing/head/antenna/double/right + antenna["antenna, trinary perfection"] = /obj/item/clothing/head/antenna/trinary_halo gear_tweaks += new/datum/gear_tweak/path(antenna) gear_tweaks += list(gear_tweak_free_color_choice) @@ -102,4 +103,4 @@ idris["Brown Idris Unit trench coat"] = /obj/item/clothing/suit/armor/vest/idris/trenchcoat/brown idris["Black Idris Unit duster coat"] = /obj/item/clothing/suit/armor/vest/idris/duster/black idris["Brown Idris Unit duster coat"] = /obj/item/clothing/suit/armor/vest/idris/duster/brown - gear_tweaks += new/datum/gear_tweak/path(idris) \ No newline at end of file + gear_tweaks += new/datum/gear_tweak/path(idris) diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index 13400a9bd3a..92f430a558f 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -593,6 +593,12 @@ icon_state = "right_robot_antennae" item_state = "right_robot_antennae" +/obj/item/clothing/head/antenna/trinary_halo + name = "trinary perfection antenna" + desc = "A decorative antenna that is commonly worn by IPCs who serve the Trinary Perfection. It resembles a golden gear." + icon_state = "trinary_halo" + item_state = "trinary_halo" + /obj/item/clothing/head/fake_culthood name = "occultist hood" icon_state = "culthood" diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm index 34935377e31..8c2c748de77 100644 --- a/code/modules/clothing/masks/miscellaneous.dm +++ b/code/modules/clothing/masks/miscellaneous.dm @@ -92,6 +92,17 @@ flags_inv = HIDEFACE body_parts_covered = 0 +/obj/item/clothing/mask/trinary_mask + name = "trinary perfection mask" + desc = "A simple lace mask worn by IPCs and organics alike while within the churches of the Trinary Perfection." + icon_state = "trinary_mask" + item_state = "trinary_mask" + w_class = ITEMSIZE_SMALL + body_parts_covered = FACE + item_flags = FLEXIBLEMATERIAL + down_body_parts_covered = null + adjustable = TRUE + //scarves (fit in in mask slot) //None of these actually have on-mob sprites... /obj/item/clothing/mask/bluescarf @@ -210,7 +221,7 @@ return if(user.get_equipped_item(slot_wear_mask) != src) return - + eye.possess(user) to_chat(eye.owner, span("notice", "You feel disoriented for a moment as your mind connects to the camera network.")) diff --git a/code/modules/clothing/suits/hoodies.dm b/code/modules/clothing/suits/hoodies.dm index 68d131209e6..79ad6951548 100644 --- a/code/modules/clothing/suits/hoodies.dm +++ b/code/modules/clothing/suits/hoodies.dm @@ -102,6 +102,11 @@ min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE canremove = 0 +/obj/item/clothing/suit/storage/hooded/wintercoat/red + name = "red winter coat" + icon_state = "coatred" + item_state = "coatred" + /obj/item/clothing/suit/storage/hooded/wintercoat/captain name = "captain's winter coat" icon_state = "coatcaptain" diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 44be098b05d..098d1958651 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -154,6 +154,12 @@ body_parts_covered = UPPER_TORSO|LOWER_TORSO flags_inv = HIDEJUMPSUIT +/obj/item/clothing/suit/trinary_robes + name = "trinary perfection robe" + desc = "Robes worn by those who serve The Trinary Perfection." + icon_state = "trinary_robes" + item_state = "trinary_robes" + /* * Misc */ diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index 092ad2ce56b..94d9ae9ca86 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -613,6 +613,13 @@ item_state = "galaxycape" overlay_state = "galaxycape" +/obj/item/clothing/accessory/poncho/trinary + name = "trinary perfection cape" + desc = "A brilliant red and brown cape, commonly worn by those who serve the Trinary Perfection." + icon_state = "trinary_cape" + item_state = "trinary_cape" + overlay_state = "trinary_cape" + //tau ceti legion ribbons /obj/item/clothing/accessory/legion name = "seniority ribbons" diff --git a/code/modules/clothing/under/accessories/badges.dm b/code/modules/clothing/under/accessories/badges.dm index f2f43cb6a9b..d57191fdd05 100644 --- a/code/modules/clothing/under/accessories/badges.dm +++ b/code/modules/clothing/under/accessories/badges.dm @@ -227,4 +227,11 @@ desc = "A descriptive identification badge with the holder's credentials displayed with a harsh digital glow." icon_state = "intelbadge" overlay_state = "intelbadge" - badge_string = null \ No newline at end of file + badge_string = null + +/obj/item/clothing/accessory/badge/trinary + name = "trinary perfection brooch" + desc = "A metal brooch worn by those who serve or follow the beliefs of the Trinary Perfection. It resembles a gear with a triangle inside." + icon_state = "trinary_badge" + overlay_state = "trinary_badge" + badge_string = null \ No newline at end of file diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm index 93ba24563d2..8d31a9ff9e5 100644 --- a/code/modules/reagents/reagent_containers.dm +++ b/code/modules/reagents/reagent_containers.dm @@ -74,7 +74,7 @@ return if(standard_splash_obj(user, target)) return - + if(istype(target, /obj/)) var/obj/O = target if(!(O.flags & NOBLUDGEON) && reagents) diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index 01a999c0194..90ac7838cbe 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -4,7 +4,7 @@ /obj/item/reagent_containers/hypospray name = "hypospray" - desc = "The DeForest Medical Corporation hypospray is a sterile, air-needle autoinjector for administration of drugs to patients." + desc = "The Zeng-Hu Pharmaceuticals hypospray is a sterile, air-needle autoinjector for administration of drugs to patients." icon = 'icons/obj/syringe.dmi' item_state = "hypo" icon_state = "hypo" @@ -15,13 +15,24 @@ flags = OPENCONTAINER slot_flags = SLOT_BELT center_of_mass = null + drop_sound = 'sound/items/drop/bottle.ogg' var/armorcheck = 1 var/time = 3 SECONDS + var/has_level_sprites = TRUE matter = list("glass" = 400, DEFAULT_WALL_MATERIAL = 200) +/obj/item/reagent_containers/hypospray/Initialize() + . = ..() + update_icon() + +/obj/item/reagent_containers/hypospray/on_reagent_change() + update_icon() + return + /obj/item/reagent_containers/hypospray/cmo name = "premium hypospray" - desc = "The DeForest Medical Corporation premium hypospray is a cutting-edge, sterile, air-needle autoinjector for rapid administration of drugs to patients." + desc = "The Zeng-Hu Pharmaceuticalsn premium hypospray is a cutting-edge, sterile, air-needle autoinjector for rapid administration of drugs to patients." + item_state = "cmo_hypo" volume = 30 time = 0 @@ -36,6 +47,22 @@ if(!do_mob(user, M, inj_time)) return 1 +/obj/item/reagent_containers/hypospray/update_icon() + if(!has_level_sprites) + return + var/percent = round((reagents.total_volume / 10) * 100) + switch(percent) + if(0 to 25) + icon_state = "[item_state]" + if(26 to 50) + icon_state = "[item_state]_25" + if(51 to 75) + icon_state = "[item_state]_50" + if(76 to 99) + icon_state = "[item_state]_75" + if(100 to INFINITY) + icon_state = "[item_state]_100" + /obj/item/reagent_containers/hypospray/afterattack(var/mob/M, var/mob/user, proximity) if (!istype(M)) @@ -74,6 +101,7 @@ amount_per_transfer_from_this = 5 volume = 5 time = 0 + has_level_sprites = FALSE /obj/item/reagent_containers/hypospray/autoinjector/Initialize() . =..() @@ -168,6 +196,7 @@ volume = 20 armorcheck = 0 time = 0 + has_level_sprites = FALSE /obj/item/reagent_containers/hypospray/combat/Initialize() . = ..() diff --git a/html/changelog.html b/html/changelog.html index 6e45e1329fe..703534dc415 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -35,6 +35,22 @@ -->
+

06 February 2020

+

Alberyk, BRAINOS updated:

+ +

Furrycactus updated:

+ +

Goret updated:

+ +

05 February 2020

VTCobaltblood updated: