Commit Graph

446 Commits

Author SHA1 Message Date
Fox McCloud
efa3aecb61 Ports TG Pickup, Equip, and Drop Sounds (#15572)
* Ports TG Pickup, Equip, and Drop Sounds

* really
2021-02-24 12:51:59 +00:00
Fox McCloud
02b9445b9b Refactors DNA Mutations; Refactors Mutations to use Traits (#15483)
* Refactors Mutations

* traits

* more work

* styling fix

* yet even more work

* oh hush

* almost there

* it continues yet further

* and that's genetics done

* and that's it folks

* last bit and golem fixup

* oof

* oops

* tweaks and fixes

* styling
2021-02-21 21:25:19 +00:00
Qwertytoforty
827ab7786a Nerfs botany potatoes 2021-02-07 10:47:54 -05:00
Fox McCloud
8947e97f3b Refactors Electrocution and Tesla Zapping (#15357)
* Refactors Electrocution and Tesla Zapping---Improves Supermatter and Tesla

* forgot this one

* fixes and styling

* last tidbits hopefully

* machine frames

* use flags

* styling
2021-02-03 20:52:03 +00:00
sneksnek
fdb8b94c3c Adds mint, a new plant that can be processed into menthol (#15383)
* Update medicine.dm

* Update herbals.dm

* Update vending.dm

* added mint seeds

* added mint harvest

* added mint plant

* an attempt to fix the problem

the pr is having trouble with growing.dmi for some reason, i was told to do this

* another empty line for the above reason

* wow okay, be like that then

* no empty lines since you're bickering

* lets see if you like this

* forgot the mint chem in reagents/misc.dm

daily reminder that im a smooth brain

* made it green and distill into menthol

* made it goon

* moving it to the appropriate file

* moved to food.dm since it's a consumable

* clarification of new distilling result for desc
2021-01-30 16:53:51 -05:00
AffectedArc07
8f72d7556e Annihilates the blackbox (#15132)
* Lets get this show on the road

* Now were talking

* These matter

* Oh the joys of CI testing

* And this

* Wrong version

* Tweaks

* More tweaks

* Lets document this

* This too

* Upgrades this

* Fixed some sanity issues

* This too

* Screw it, this too

* More sanity

* And these

* This too

* Documentation

* This too

* Fixes **awful** scoreboard logic

* Why do we care about only half-absorbing someone

* Revert "Why do we care about only half-absorbing someone"

This reverts commit 8de1cfdf05.

* Refactors these

* Hashing

* Moxian tweaks
2020-12-24 16:06:48 -05:00
moxian
1683c4271a Refactors renaming things with a pen. (#14960)
* Refactors renaming things with a pen.

* Farie review (thanks!!)

* Derp.

* Farie take 2
2020-12-16 14:43:15 -05:00
moxian
290fbca27c Make can_inject deterministic; fix odysseus syringes sometimes not working [PR #12858, take two] (#14637)
* PR #12858 revival

* Move the can_inject unit tests to unit_tests/

* Remove the can_inject unit tests
2020-11-03 12:27:43 -05: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
PacifistDalek
0c22bb3e7e Updating some of our food sprites to better ones from other codebases (#14694)
* Adding in new sprites for a bunch of crappy food sprites

* Adding attribution for Goon origin sprites

https://github.com/binarysudoku has relicensed the sprites requested for our use (relicensing means they don't have to go in a separate folder). I've included attribution notes on each sprite that I've taken, as per our license

* Added a bunch more sprite changes!

* forgot the holymelon

* Updating trash sprites for junk food, adding a space twinkie trash sprite
2020-10-25 00:16:13 -04:00
PacifistDalek
f312297f9d A variety of minor food related fixes and tweaks (#14656)
* Changed Milo to Miso

* Update baked_goods.dm

* typo fix

* Revert "typo fix"

This reverts commit 3f6ca6a5b9.

* Revert "Revert "typo fix""

This reverts commit b67ed80d8d.

* Update food.dm

* removing beff and pepperoni

* adding onions as juiceable

* made drying grapes give you homemade raisins since homemade raisins were already in the code

* undo the onionjuice because it crashed my test server

* replaced the vomit cheese with vomit cheese substitute, removed beff and pepperoni, made weird cheese actualy spawn a weird cheese wedge

* updated enzyme name and description to match how catalysts actually work and how the enzyme already works in game (and has for almost a decade in game)

* Moved onion rings to the deepfryer instead of microwave

* makes the fries recipe actually makes sense, and makes it benefit from the upgrades of the processor (so you can get more fries)

* made macaroni and cheese names consistent

* moved two recipes to oven from microwave

* Wine comes from grapes ya dingus

* name fix

* made burger recipes consistent except for the big bite and super big bites

* yaki imo is baked whole sweet potato, not processed!

* Update code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* Update code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* Update code/modules/food_and_drinks/food/foods/pizza.dm

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* made food names consistently lower case

Except of course for foods that are supposed to be brand names, like Space Twinkie or the BigBite burger

* Missed one

* Back to american mac 'n' cheese spelling

* Macaroniiiii

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2020-10-21 09:40:27 -04:00
Peak
a3bb36bf39 Omega Weed Balance Changes (#14584)
* Update cannabis.dm

* Update cannabis.dm
2020-10-14 20:54:45 -04:00
yorii
25150a2a7a fix botany growthstage rounding error 2020-10-03 22:39:33 +02:00
Kugamo
3df2f3ac4e Adds Botany Jugs, and fixes hydroponic trays draining sealed containers [now without map edits] (#14212)
* Adds Botany Jugs, and lid test for hydro trays

* adds 1u and 2u transfer amounts back to changed items

* fixed item references in some .dmm

* improves weed/pest killer jug sprites, and corrects overlays procs

* removes uneeded image def

* improves sprites further

* adjusts coloring of l4z reagant

* Buffs Jugs to 80u each (from 50u)

* balances nutrient vending numbers

* resizes jugs

* fixes conflict in .dmi

* Resizes Jugs again

* removes commented out code

* Fixes

* futher fixes

* Fixes some issues, adds sounds for jugs.

* reverts to using New()

* removes jug.dm and reverts all nutrient back to bottles
2020-09-18 01:14:19 -04:00
joep van der velden
0bfe9d994e Merge remote-tracking branch 'upstream/master' into bombing-logging-and-co 2020-09-16 15:26:19 +02:00
mochi
fb9a4831db Fix replica pod cloning species with NO_SCAN 2020-09-14 11:11:31 +02: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
79b68e0696 Better wrenching code
Probably
2020-08-11 05:34:53 +01:00
SabreML
5f6f54429d Fixed wood drop oversight 2020-08-11 05:27:27 +01:00
SabreML
67631d0dad Changed message to 'to_chat' 2020-08-10 21:14:01 +01:00
SabreML
4559b00f25 Allows fermenting barrels to be deconstructed, and anchored. 2020-08-10 20:31:07 +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
e18c3ec598 Merge branch 'master' into no-transfer-verb 2020-08-08 13:11:51 -05:00
AffectedArc07
c99c56411d Merge pull request #14034 from farie82/throw-and-fruit-logging
Improves botany fruit logging. Makes throws not spam admins when the item does no damage
2020-08-08 16:34:47 +01:00
joep van der velden
d89572afee review changes 2020-08-08 07:39:25 +02:00
joep van der velden
f4910dcc79 Makes grown/On_Consume actually work properly 2020-08-08 00:03:16 +02:00
joep van der velden
0cccd0ebf0 Improves botany fruit logging. Make throw logging more logical 2020-08-07 23:55:11 +02:00
SteelSlayer
ba2543810f Hides the "Set transfer amount" verb on certain items like syringes 2020-08-05 14:26:00 -05:00
warior4356
cb06ebdd9f Refactor complete. Matches added. 2020-07-13 22:05:56 -07:00
Fox McCloud
23e594b246 Merge pull request #13773 from Gatchapod/hydro-SR-fix
Fixes SR spawning mobs in nullspace instead of hydroponics trays
2020-07-05 14:38:32 -04:00
Gatchapod
5cfc0e1e85 this is objectively a superior way of doing it 2020-07-05 20:01:06 +02:00
Gatchapod
4fd4a949aa no more nullspace tomatoes and trees 2020-07-05 15:06:04 +02:00
Kyep
547d76fb4b Cyborg Improvements (#13056)
* ash storm immunity

* safety override & lavaproof upgrades

* mini-extinguisher for janiborg

* borg cell paths, prevent station borgs using gamma module

* Limit crew SecBorgs to 2, DS borg laser reflection

* replaces standard module with generalist module

* generalist borg gets crowbar

* fix bug where ert engi/med borgs runtime / do not get sprites

* adds TG lavaland and spidermin mining cyborg icons

* roundstart borgs=2, spawn locations=4

* adds damage_protection mechanic

* add xeno_disarm_chance

* ERT borg naming scheme: (level) ERT (number)

* std borg: tweaks hypo, RMs holoproj, adds mats/subsystems

* AA bullet_arc refactor

* refactors var/require_module to be bool, proc/action() to return bool

Suggested by farie82

* better radio for generalist

* rework gamma borgs, split of destroyer borgs

* dead robots fix

* fixes error caused by merging of PR 12932

* manually fix line endings

* fixes borg energy weapons (except disablers) not being recharged within recharging stations

* add trailing newline to make travis pass

* compatibility with #13471 life refactor

* deletes change to gamma sec ERT laser beam energy cost

* refactor handling of ash/lava immunities

* removes spiderlike mining borg sprite

* tweaks generalist borg loadout

* limit secborgs to 1 on green alert / roundstart

* re-run icondiffbot

Co-authored-by: Kyep <Kyep@users.noreply.github.com>
2020-06-28 14:16:14 -06:00
SteelSlayer
74d0e6523b Fixes welders blinding you when you repair robo-limbs and cyborgs (#12988)
* Fixes welders blinding you while repairing your own robo-limbs

* gives tool_start_check() a target argument

* flash be gone

* CRLF to LF

* adds trailing newlines because travis wants them I guess

Co-authored-by: SteelSlayer <SteelSlayer@users.noreply.github.com>
2020-06-26 01:18:13 -06:00
Fox McCloud
b3d69aac9b Moves to BYOND 513 (#13650)
* Fixes Orbiting

* moves to 513

* travis update

* check for minor version too
2020-06-26 01:15:59 -06:00
SteelSlayer
db4d44901d on cross removal 2020-06-24 11:33:31 -05:00
joep van der velden
d3743f83fa Improves bomb logging and replaces single attack log msges with actual logging 2020-06-08 23:44:06 +02:00
SteelSlayer
7088de6bab slippery component 2020-06-06 15:35:12 -05:00
SteelSlayer
c2813a73e2 Removes the Freeze Mech verb, and bundles its functionality into the Freeze verb (#12827)
* Makes the Freeze Mech admin verb work properly

* freeze overhaul, axe Freeze Mech verb

* define freeze on the atom/movable level

* CRLF to LF

* rebase and touch ups

Co-authored-by: SteelSlayer <SteelSlayer@users.noreply.github.com>
2020-05-21 21:41:00 -06:00
Pidgey
43f664f4a7 Diona nymphs can eat veggies (#12423)
* Diona Nymphs can now consume vegetables. It takes 2 seconds to do so, and they gain nutrition based on how much plant matter and/or nutriment is present. This tends to be a slightly slower way to grow than eating weeds (unless specialized plants are provided for the purpose, like high potency pumpkins) but provides an option to nymphs that have nothing but earthsblood trays around.

* Changed the spacing a bit.

* Changing some minor things in line with provided code reviews.

* Hopefully this is an improvement.

* Requested minor changes

* Swapped type check with isnymph(). I didn't even know these defines existed.
2020-05-21 20:21:42 -06:00
Deckard Cain
f97bc5876b fixed apples not distilling in fermenting barrels
apples previously distilled into hcider, which was an icon state and not actually a reagent proper. this resulted in apples simply not fermenting into anything when processed in a fermenting barrel. (if the apples contained reagents such as plant_matter or sugar or whatever else botanists put in their genes, then these would of course be transferred to the barrel normally.)
2020-05-14 16:53:41 -04:00
AffectedArc07
928a8f0e04 Makes the code pass dreamchecker (#13161)
* Initial Commit - Trying to add DC to Travis

* Forgot to chmod

* This took too long

* Farie Fixes

* Fixes new code

* Job factions are fucking smelly

* Loadouts work again

* Runtime fixes
2020-04-11 15:59:16 -06:00
AffectedArc07
ded391b325 Bonfire Logs (#13268)
* Bonfire Logs

* Farie Suggestion

* Adds craft logging

* Log changes
2020-04-11 15:47:45 -06:00
Crazy Lemon
f555d49b9a Removes all usages of a certain word in a certain sense (#13277) 2020-04-09 13:43:10 -04:00
AffectedArc07
a36636ed0c Speedpurge Bad Comments 2020-04-09 13:42:56 +01:00
AffectedArc07
210f8badf4 Makes all global variables handled by the GLOB controller (#13152)
* Handlers converted, now to fix 3532 compile errors

* 3532 compile fixes later, got runtimes on startup

* Well the server loads now atleast

* Take 2

* Oops
2020-03-20 21:56:37 -06: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
AffectedArc07
5baaabe12e Merge branch 'master' into var/const-to-define 2020-03-09 10:33:59 +00:00
variableundefined
edebec5194 Merge pull request #13021 from Fox-McCloud/add-cbd
Adds CBD
2020-03-08 21:46:20 -04:00