-
-
Notifications
You must be signed in to change notification settings - Fork 539
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request replaces concrete jugs with concrete bags <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game 's fluff <!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. --> ## Changelog :cl: rye, erika add: concrete jugs have been replaced by much more appropriate concrete bags, jee, i hope whoever made *that* blunder got fired. /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. -->
- Loading branch information
Showing
7 changed files
with
62 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,58 @@ | ||
/* In a better world, the logic for transfering reagents out of containers wouldn't be in /glass */ | ||
|
||
/obj/item/reagent_containers/glass/concrete_bag | ||
name = "\improper concrete mix bag" | ||
desc = "A bag of concrete mixture from the F.O.O.D corportation. Just add water!" | ||
w_class = WEIGHT_CLASS_HUGE //25+ kg | ||
throw_range = 1 | ||
|
||
amount_per_transfer_from_this = 25 | ||
possible_transfer_amounts = list(25,50,75,100) | ||
list_reagents = list(/datum/reagent/concrete_mix = 200) | ||
reagent_flags = OPENCONTAINER | ||
volume = 200 | ||
|
||
icon = 'icons/obj/chemical/concrete.dmi' | ||
icon_state = "concrete_bag" | ||
item_state = "concrete_bag" | ||
lefthand_file = 'icons/mob/inhands/misc/concrete_bag_lefthand.dmi' | ||
righthand_file = 'icons/mob/inhands/misc/concrete_bag_righthand.dmi' | ||
fill_icon_thresholds = null | ||
|
||
var/opened = FALSE | ||
var/opened_icon_state = "concrete_bag_open" | ||
|
||
drop_sound = 'sound/items/handling/cloth_drop.ogg' | ||
pickup_sound = 'sound/items/handling/cloth_pickup.ogg' | ||
|
||
/obj/item/reagent_containers/glass/concrete_bag/examine(mob/user) | ||
. = ..() | ||
if(!opened) | ||
. += span_notice("[src] is unopened") | ||
else | ||
. += span_notice("[src] has been opened") | ||
|
||
/obj/item/reagent_containers/glass/concrete_bag/AltClick(mob/user) | ||
if(!can_interact(user)) | ||
return | ||
if(!opened) | ||
if(do_after(user, 3 SECONDS)) | ||
visible_message(span_notice("[user] tears the top of [src] off!"), span_notice("You tear the top off [src]!")) | ||
playsound(src, 'sound/items/poster_ripped.ogg', 50, 1) | ||
new /obj/effect/decal/cleanable/generic(get_turf(src)) | ||
icon_state = opened_icon_state | ||
spillable = TRUE | ||
opened = TRUE | ||
return | ||
return | ||
return | ||
|
||
/obj/item/reagent_containers/glass/concrete_bag/attack_self(mob/user) | ||
if(!opened) | ||
return | ||
..() | ||
|
||
/obj/item/reagent_containers/glass/concrete_bag/attack(mob/user) | ||
if(!opened) | ||
return | ||
..() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters