Commit Graph

46 Commits

Author SHA1 Message Date
Nathan Winters 417ad89267 Small container transfer rate change improvements (#18780)
* Avoid extraneous warning on `set_APTFT()` cancel

* Add `set_APTFT()` success feedback message

* Standardize `possible_transfer_amounts`

* Cryptic var names begone

* Unhardcode "It will transfer X units" examine note

* Fix grammar
2022-09-01 13:31:18 +01:00
Pidgey ddfecf85f5 - Converts honeycomb from reagent_containers to type reagent_containers/food/snacks. (#18922)
- Adds honeycomb as an item that can be picked up in plant bags.
2022-08-31 13:20:26 +01:00
moxian e639b8acab /obj/item/reagent_container is Initialize (#18555) 2022-08-05 20:39:25 +01:00
Vi3trice f4b37b4177 Port TG updating appearances (#17943)
* Get pants that match or else you gonna look silly yo

* Posters

* Fix other hud elements

* Rereviewed

* Update shotglass.dm

* Fix for new merged PRs

* Typo

* Coming across other stuff

* Update theblob.dm

* No takebacksies

* smh i forget to leave a comment

* Updated for the detgun and cards

* Should have rerun langserver again

* No longer plastic, more in scope

* Damn you bluespace

* Reverting turret logic, out of scope at this point

* Tweak that part

* Went over energy guns again, and fixed UI White's sprite sheet

* Welding masks, glasses, and JUSTICE

* Update portable_atmospherics.dm

* Cleaning up, clearing things up

* Review and suggestions

* Update valve.dm

* More tweaks

* Missing character

* Not distinct lightmasks, so they can be overlays

* Update generator.dm

* Add parameter so holodeck doesn't try to make a perfect copy

* Update unsorted.dm

* Spiders

* Better fix for spiders, fix vamps too

* Ghosts

* Update telekinesis.dm

* Cleaning up old procs

* It's set up to not copy datums... Unless they're in a list

* Donuts, duct tape, and detgun. D3VR coming to Early Access

* Update procs that interact with doors so they call update_state instead

* Forgot one spot, and actually might as well just force lock

* Cleaning up other things... Sigh, and kitty ears

* oops

* Getting used to how it works

* blinds

* Going back to the suit obscuring thing, so it doesn't update all the time

* Missed that from merging master

* I made this PR and forgot about it

* Fix runtimes in cards

* Make things a bit more unified

* Update update_icons.dm

* yarn, really?

* Update library_equipment.dm

* Update shieldgen.dm

* Every time Charlie merges something, I go back and see if I can improve things further

* what's this? more?

* Update misc_special.dm

* wow, paper

* Review

* More reviews

* To be sure, seems like being broken messed something sometimes

* Brought airlocks closer to how TG works to iron out some stuff

* Pizza and morgue

* Doesn't seem to hurt, tried with holodeck

* Revert "Doesn't seem to hurt, tried with holodeck"

This reverts commit 158529302b.

* Icon conflict

* Fix organ damage

* Don't ask how. Why. It's like that on prod too.

* Cutting down on things and updating from TG.

* More flexible. Just in case the thing you stuck it on didn't destroy.

* Hydro was one the things I touched earlier on, better rework it

* Reviews

* Cleaning up further, also bri'ish

* Undo a change I did, and switch over to a more recent implementation

* Update biogenerator.dm

* Rolling back to old airlocks, but with new duct taped note

* Functionally the same. I'd just rather not have the smoothing happen there

* Went over APCs again

* Fix welding helmet names in species files

* Update airlock.dm

* Update persistent_overlay.dm

* Oh, topic
2022-07-21 08:11:59 +02:00
SabreML 0b375de42c Removes the the vast majority of 'The the' from the the code (#15597)
* The the

* Some more

* Review 1

* A couple more
2021-06-20 10:20:32 -04:00
Dragonkiller93 544ed9e2c4 FIxes apiary text for queen placement. (#15954)
* FIxes apiary text for queen placement.

* Update code/modules/hydroponics/beekeeping/beebox.dm

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

* Sets gender of queen bee instead.

* Revert "Sets gender of queen bee instead."

This reverts commit 409df4a22d.

* Sets queen bee gender instead.

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2021-05-08 22:09:44 +01:00
AffectedArc07 2c37ae8fd0 The road to Initialize() stability - Enforcing parent call on New(), Initialize() and Destroy() (#14719)
* The road to Initialize() stability

* Fixes sanity, for now
2020-10-28 12:35:36 -04:00
AffectedArc07 0ccf04ba23 Merge pull request #14056 from SabreML/Wood-Deconstruction
Makes more wooden structures deconstructable.
2020-09-02 11:05:33 +01:00
SabreML 8b55cd9965 Review tweaks 2020-08-11 10:10:19 +01:00
SabreML 5f6f54429d Fixed wood drop oversight 2020-08-11 05:27:27 +01:00
SabreML 5f8d0573ed Allows apiaries to be deconstructed
Not tested with bees inside, so this may not work.
2020-08-10 20:30:48 +01:00
SteelSlayer ba2543810f Hides the "Set transfer amount" verb on certain items like syringes 2020-08-05 14:26:00 -05:00
AffectedArc07 04ba5c1cc9 File standardisation (#13131)
* Adds the check components

* Adds in trailing newlines

* Converts all CRLF to LF

* Post merge EOF

* Post merge line endings

* Final commit
2020-03-17 18:08:51 -04:00
Citinited fddff1049b [Testmerge ready] Ports tool behaviours; refactors all tools; adds functionality for self-filling reagent containers (#11700)
* Adds support for self-filling reagent containers

* Sets tool_behaviour on the default set of tools

* Fixing merge conflicts

* Refactors welder to use tool behaviour

* The refactor: part I

* The refactor: part II

* Tool Refactor Part III: Revenge of the Maint

* Tool Refactor Part IV: A New Hope

* Tool Refactor Part V: The Oldcoder Strikes Back

* Tool Refactor Part VI: Return of the Coder

* VII

* Holy shit, it compiles?!

* Nannek I completed your TODO, you owe me ice cream

* Tool helpers; telepad is compliant

* Bugtest, Round 1: Fight

Fuck refactoring disposals

* Buggfixing, Round 2: Electric Boogaloo

* Personal crafting uses tool behaviours now

* Construction datums use new tool behaviours; better way of handling fueltank refuelling; more bugfixing

* multitool_check_buffer change; removes some useless things in tool_helpers

* proc name change

* TRUE/FALSE changes

* Bugfixing, Round 3: A Good Day To Bugfix Hard

Fixes multiple issues raised by the testmerge

* Minor style changes
2020-02-15 13:31:08 -07:00
Fox McCloud 20c4cf0a08 for-if-I-stand-I-stand-by-his-will-alone 2019-10-03 19:52:03 -04:00
farie82 0e8ddb2afe Refactors the examine proc to return a list of strings (#12280) 2019-09-25 22:05:01 -07:00
Mark van Alphen 4423962a2a Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
# Conflicts:
#	code/controllers/subsystem/mapping.dm
#	paradise.dme
2019-04-26 23:07:57 +02:00
Fox McCloud 0034e851a1 Kills off Object and Fast Object Processes 2019-04-23 23:53:40 -04:00
Mark van Alphen c878f8e36e Lavaland code review fixes - also integrates flyswatter and cat toy 2019-04-20 00:24:58 +02:00
Fox McCloud e487b8b58e gosh dang 2019-04-01 16:22:20 -04:00
Fox McCloud 3e9e057a1a Fixes Bees 2019-04-01 03:16:21 -04:00
Desolate c974e29a3c global lists global defined 2018-10-02 15:52:46 -05:00
Fox McCloud 7440dad57e further conversion 2018-07-18 01:13:24 -04:00
Tayyyyyyy 42f85919de More their 2018-05-25 18:34:26 -07:00
Fox McCloud 8c7b543415 The Great Conflictening 2.0: Removes /obj/item/device 2018-04-25 23:07:35 -04:00
Fox McCloud 5c4aa9b3fd Removes All Weapons 2018-04-15 16:25:56 -04:00
Birdtalon 124bd9a98d adds check for null beegent 2017-10-08 18:37:53 +01:00
Birdtalon ead173ac19 remove while loop replace with get_random_reagent_id() 2017-09-15 20:09:27 +01:00
Birdtalon 4dcdd649f9 prevents bees form synthesising forbidden reagents 2017-09-14 21:23:16 +01:00
Fox McCloud 12c4b2933c Hydro and Bees GC fixes (#7221)
* Hydro and Bees GC fixes

* more shit
2017-05-06 15:01:36 -07:00
Fox-McCloud dc0710135e more fixes 2017-01-23 00:53:44 -05:00
Fox-McCloud 104bfab759 sprite and code fixes 2017-01-22 23:25:56 -05:00
Fox-McCloud 706347fd84 even more work 2017-01-22 08:11:31 -05:00
Fox-McCloud ea76990b7a Botany Rework 2017-01-21 18:28:03 -05:00
KasparoVy ffc0083098 bottlefix 2016-09-18 01:06:47 -04:00
Jazzdoodle a6a2aa2fda Update beekeeper_suit.dm 2016-09-09 07:24:26 -05:00
Jazzdoodle c36b560776 Fixes the beekeeper suit and hat descriptions
Just a minor text fix.
2016-09-07 21:14:56 -05:00
taukausanake 55326e1c70 Technical difficulties
Decided to scrap the beekeeping HUD for now. Turned out it's way more complicated that I thought. I'll try it again in the future.
Added the Hydro HUD design for Protolathe. Need to test if it works.
Might have made a mistake in Git so commiting in order to pull from Paradise master to see if anything broke.
2016-06-20 11:20:32 -05:00
taukausanake eec29a3e9c I DID IT
Finally got the HUDs to work all thanks to Crazylemon. The only thing that doesn't work is the hudharvest2 is_type_in_list() check I made but I could get rid of it
2016-06-18 18:10:31 -05:00
taukausanake 130096aced Hydroponic HUDs
Everything is done. Except it doesn't work. I must be missing something somewhere but otherwise I did everything that appeared needing to do. Based it off of mech diag HUD so that might be the issue.
Code as of now does not let you join the server. Need to revert bit by bit and find out what I did wrong
2016-06-09 17:46:09 -05:00
FalseIncarnate ee4060549d Mutant Plant De-spam-ification
Mutated / Modified / Enhanced plants will no longer add new prefixes to
their names resulting in obscenely long names like "mutant mutant mutant
mutant mutant mutant enhanced mutant mutant modified wheat"
- Plants will now simply use a single "mutant", "modified", or
"enhanced" prefix to their name, determined by the last type of
modification used.
- This means you can mutate a modified plant and then pass it off as
merely "enhanced" if you do things in the right order

HAPPY SIDE EFFECT BONUS FUNTIME EXTRAVAGANZA!
- The chef's smartfridge will now compact ALL mutant, modified, or
enhanced versions of a given plant into a single listing.
- No longer will you have 50 listings of mutated wheat (with ever-longer
names) because the botanist decided to raise a couple bees.

Bees also now can not affect hydroponics trays that have their lids up.
- Raise your strange plants in peace, knowing the bees won't make them
stranger unless you want them to.

Premade beeboxes (and the random variant) now have the right kind of
worker bees, instead of the generic "bee" type.
- This was a mistake / oversight on my part from the bee refactor in the
Bee Briefcase PR.
- For reference, the premade (and random) beeboxes are admin spawn /
mapper only. That's why this never was noticed.
2016-05-22 01:46:46 -04:00
FalseIncarnate 9a39567189 Briefcase Full of BEES!
The situation has only been made worse by the addition of yet more bees!

Adds the brand new botanist traitor item: BRIEFCASE FULL OF BEES!
- Just your average briefcase by looks, but don't be fooled, this
briefcase contains Syndicate-bred bees intent on ruining days.
- Botanist-only traitor item, 10 TC
- On use, it actually ANNOUNCES ITSELF to the station with a
station-wide intercomm broadcast of DR. BEES!
- The sound clip has a cooldown. Releasing the bees does not.
- Comes loaded with 10 bees, releasing up to 5 bees per use
- Inject blood into the briefcase to train the bees still inside (not
ones already released) to NOT attack the donor(s)
- There is no way to put bees back into the case, but rumors abound of a
reagent that can replicate syndi-bees. How strange...

Refactors bee code a bit, and makes normal bees less murder-y
- Fixes #4306

Adds new bee type: Syndi-bee
- Never returns home
- Never pollinates
- More health and slightly more damage
- Normal bees: 10 hp, 1 damage. Syndi-bees: 25 hp, 5 damage
- Always injects Flurosulphiric acid into its victims... EVEN THOSE IN
HARDSUITS
2016-05-05 00:12:44 -04:00
TheDZD 341034e37d Refactors hostile mob code, unsnowflakes bears, panthers, and snakes
Also fixes some bee stuff.
2016-04-14 20:36:45 -04:00
TheDZD bb1caa4eea Instances loc setting should now all 🐝 changed to forceMove() 2016-04-14 20:30:34 -04:00
TheDZD 8109a5e1ee to_chat() should no longer 🐝 an issue 2016-04-14 20:30:31 -04:00
TheDZD eba294357a It's the bees 2016-04-14 20:30:30 -04:00