Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bugfix: lost coca sprites, grill abdwindow, wclass #3803

Merged
merged 1 commit into from
Nov 2, 2023
Merged

bugfix: lost coca sprites, grill abdwindow, wclass #3803

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion code/__DEFINES/is_helpers.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,8 @@ GLOBAL_LIST_INIT(glass_sheet_types, typecacheof(list(
/obj/item/stack/sheet/plasmaglass,
/obj/item/stack/sheet/plasmarglass,
/obj/item/stack/sheet/titaniumglass,
/obj/item/stack/sheet/plastitaniumglass)))
/obj/item/stack/sheet/plastitaniumglass,
/obj/item/stack/sheet/abductorglass)))

#define is_glass_sheet(O) (is_type_in_typecache(O, GLOB.glass_sheet_types))

Expand Down
1 change: 1 addition & 0 deletions code/game/objects/items/weapons/anomaly_extract.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
icon = 'icons/obj/items.dmi'
icon_state = "slime_extract1"
item_state = "syringe_0"
w_class = WEIGHT_CLASS_TINY
var/used = FALSE

/obj/item/anomaly_extract/attack_self(mob/user)
Expand Down
3 changes: 3 additions & 0 deletions code/modules/reagents/chemistry/reagents/drugs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1164,6 +1164,9 @@
taste_description = "pleasant bitterness"
shock_reduction = 50
metabolization_rate = 0.4 * REAGENTS_METABOLISM
drink_icon = "matedecoca"
drink_name = "Mate De Coca"
drink_desc = "A tea made of cocaine. Especially intresting drink."

/datum/reagent/matedecoca/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
Expand Down
Binary file modified icons/mob/clothing/mask.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/obj/drinks.dmi
View file
Open in desktop
Binary file not shown.
Loading