cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-24 05:23:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Sprite and Bug Fixes Again Again (#17477)

Browse Source 
* Sprite and Bug Fixes Again Again

Fixes #17465
Fixes #17462
Fixes #17456
Fixes #17450
Fixes #17458
Fixes #17422

* changelog
This commit is contained in:
Wowzewow (Wezzy)
2023-09-29 14:01:43 +00:00
committed by GitHub
parent 84f8271e88
commit 9c69a6e884
11 changed files with 69 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/spacesuits/rig/rig.dm
+12 -6
View File
@@ -37,6 +37,7 @@
slowdown = 1 // All rigs by default should have slowdown.
var/has_sealed_state = FALSE
var/has_hidden_jumpsuit = FALSE
var/interface_path = "hardsuit.tmpl"
var/ai_interface_path = "hardsuit.tmpl"
@@ -180,6 +181,10 @@
armor_component.RemoveComponent()
piece.AddComponent(/datum/component/armor, armor, ARMOR_TYPE_STANDARD|ARMOR_TYPE_RIG)
if(chest.flags_inv & HIDEJUMPSUIT)
has_hidden_jumpsuit = TRUE
chest.flags_inv &= ~HIDEJUMPSUIT
set_vision(!offline)
update_icon(1)
@@ -255,7 +260,7 @@
seal_delay = is_in_cycler ? 1 : initial(seal_delay)
var/jumpsuit_was_hidden = FALSE
if(suit_is_deployed() && (wearer.wear_suit.flags_inv & HIDEJUMPSUIT) && !instant)
if(suit_is_deployed() && (wearer.wear_suit.flags_inv & HIDEJUMPSUIT) && !instant && has_hidden_jumpsuit)
/// Don't hide the jumpsuit while removing the rig.
wearer.wear_suit.flags_inv &= ~HIDEJUMPSUIT
wearer.update_inv_wear_suit()
@@ -308,10 +313,11 @@
wearer.update_inv_gloves()
if("chest")
to_chat(wearer, "<span class='notice'>\The [piece] [!seal_target ? "cinches your chest tightly" : "releases your chest"].</span>")
if(!seal_target)
piece.flags_inv |= HIDEJUMPSUIT
else
piece.flags_inv &= ~HIDEJUMPSUIT
if(has_hidden_jumpsuit)
if(!seal_target)
piece.flags_inv |= HIDEJUMPSUIT
else
piece.flags_inv &= ~HIDEJUMPSUIT
wearer.update_inv_wear_suit()
if("helmet")
to_chat(wearer, "<span class='notice'>\The [piece] hisses [!seal_target ? "closed" : "open"].</span>")
@@ -341,7 +347,7 @@
canremove = !seal_target
if(airtight)
update_component_sealed()
if(jumpsuit_was_hidden && wearer.wear_suit == chest)
if(jumpsuit_was_hidden && wearer.wear_suit == chest && has_hidden_jumpsuit)
wearer.wear_suit.flags_inv |= HIDEJUMPSUIT
update_icon(1)
return 0
code/modules/clothing/spacesuits/rig/rig_pieces.dm
+2 -1
View File
@@ -40,7 +40,7 @@
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
flags_inv = HIDETAIL
flags_inv = HIDEJUMPSUIT|HIDETAIL
item_flags = THICKMATERIAL|AIRTIGHT|INJECTIONPORT
slowdown = 0
//will reach 10 breach damage after 25 laser carbine blasts, 3 revolver hits, or ~1 PTR hit. Completely immune to smg or sts hits.
@@ -91,6 +91,7 @@
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
flags_inv = HIDEJUMPSUIT
item_flags = THICKMATERIAL|INJECTIONPORT
/obj/item/clothing/shoes/lightrig
code/modules/mob/abstract/new_player/sprite_accessories.dm
+1 -1
View File
@@ -5795,7 +5795,7 @@ Follow by example and make good judgement based on length which list to include
name = "Tattoo (Koi, L. Arm)"
body_parts = list(BP_L_ARM)
/datum/sprite_accessory/marking/tat_koiright_arm
/datum/sprite_accessory/marking/tat_koi/right_arm
name = "Tattoo (Koi, R. Arm)"
body_parts = list(BP_R_ARM)
code/modules/mob/mob_grab.dm
+2
View File
@@ -319,6 +319,8 @@
var/mob/living/carbon/human/A = affecting
if (!(A.species.flags & NO_BREATHE))
A.losebreath += 4
var/obj/item/organ/external/O = A.get_organ(BP_HEAD)
O.add_autopsy_data("Strangling")
affecting.set_dir(WEST)
else if(state == GRAB_KILL)
hud.icon_state = "kill"
code/modules/reagents/reagent_containers/food/drinks.dm
+1 -1
View File
@@ -15,8 +15,8 @@ If you add a drink with an empty icon sprite, ensure it is in the same folder, e
icon = 'icons/obj/drinks.dmi'
drop_sound = 'sound/items/drop/bottle.ogg'
pickup_sound = 'sound/items/pickup/bottle.ogg'
contained_sprite = TRUE
icon_state = null
item_state = "glass_empty"
flags = OPENCONTAINER
amount_per_transfer_from_this = 5
volume = 50
code/modules/reagents/reagent_containers/food/snacks/cultural/tajara.dm
+2 -2
View File
@@ -604,7 +604,7 @@
nachotrans = /obj/item/reagent_containers/food/snacks/chip/nacho/sourcream
avahtrans = /obj/item/reagent_containers/food/snacks/chip/miniavah/sourcream
chiptrans = /obj/item/reagent_containers/food/snacks/chip/sourcream
icon = 'icons/obj/item/reagent_containers/food/mexican.dmi'
icon = 'icons/obj/item/reagent_containers/food/cultural/tajara.dmi'
icon_state = "dip_sourcream"
reagents_to_add = list(/singleton/reagent/nutriment = 20)
reagent_data = list(/singleton/reagent/nutriment = list("sour cream" = 20))
@@ -616,7 +616,7 @@
nachotrans = /obj/item/reagent_containers/food/snacks/chip/nacho/tajhummus
avahtrans = /obj/item/reagent_containers/food/snacks/chip/miniavah/tajhummus
chiptrans = /obj/item/reagent_containers/food/snacks/chip/tajhummus
icon = 'icons/obj/item/reagent_containers/food/mexican.dmi'
icon = 'icons/obj/item/reagent_containers/food/cultural/tajara.dmi'
icon_state = "dip_hummus"
reagents_to_add = list(/singleton/reagent/nutriment = 20)
reagent_data = list(/singleton/reagent/nutriment = list("sweet hummus" = 20))