Commit Graph

877 Commits

Author SHA1 Message Date
SgtxRootbeer
63d32fb1bd Removes trekchems, adds new catagory 2 chems. cobby-approved. (#45105)
* Add files via upload

* Update Sleeper.dm

* Update borghydro.dm

* Update robot_upgrades.dm

* Update buffs.dm

* Update medbot.dm

* Update snacks_other.dm

* Update snacks_other.dm

* Update medicine_reagents.dm

* Update medicine.dm

* Update chem_synthesizer.dm

* Update hypospray.dm

* Update snacks_other.dm

* Update snacks_other.dm

* Add files via upload

* Update snacks_other.dm

* Delete ambrosia.dm

* Delete cannabis.dm

* Add files via upload

* Update buffs.dm

* Update medicine.dm

* Update medbot.dm

* Update Sleeper.dm

* Update medbot.dm

* listen, i know what this looks like

* yes, i did this in the webeditor

* Update medicine.dm

* Update medbot.dm

* Update borghydro.dm

* Update Sleeper.dm

* Update robot_upgrades.dm

* Fixes metabolism rate

Don't tell cobby I did this one on my phone

* Updates metabolism rate for real

* fixes spelling errors

* Add files via upload

* Update medicine_reagents.dm

* Update medicine_reagents.dm
2019-07-24 12:18:11 -04:00
Qustinnus
b33d1c49a3 [READY] Floydmats (Datum materials) & custom toolboxes (#45118)
* Initial work

* more

* ass

* wsedfwedff

* asss

* test

* stuff

* fuck

* sss

a

* kms

* asdadwedwdfwefwef

* start

* test

* dwwdew

* ewefwfef

* Redemption machine (#8)

* Redemption machine

* Removes debug messages

* changes

* fuckmyshitup

* coin mint works with new material shenanigans (#10)

* Auto stash before merge of "materials" and "origin/materials"

* woops

* furnace (#11)

* autolathe manufacturing of toolboxes

* eggs in a basket

* some small changes

* matcolors

* documentation

* more documentation and effects

* done

* Color man bad (#12)

* fixes designs

* ass

* more fixes

* fuck me

* firestacks adder

* epic fixes

* fixes designs

* DONE DIDDILY DOO

* removes category macro

* ch-ch-ch-changes

* fixes some stuff

* Fixes display of ore values (#9)

* Redemption machine

* Removes debug messages

* Re-adds value display

* Replaces the fire stacking component with an element instead (#13)

* fixes examine

* fixes ligma bugs

* double ligma boofus

* fix

* misses some defines

* fixes ORM

* Update code/datums/components/material_container.dm

Co-Authored-By: Emmett Gaines <ninjanomnom@gmail.com>

* fixes

* Makes glass objects weaker (#14)

* Makes glass objects weaker

* uses correct proc

* fixes shit

* honk honk

* better

* oh shit oh fuck

* fixes

* fuck ORMs

* fixes the biogen

* documentation

* ass (#15)

* component

* changes

* ass

* ass

* doc

* Auto stash before merge of "materials-plasmacomponent" and "origin/materials-plasmacomponent"

* fixes rounding

* fixed
2019-07-24 11:27:01 -04:00
oranges
4826d1e5d9 Growns no longer cause a runtime in components code (#45213)
This was using the wrong inventory proc, trying to remove the grown 
from the user before it was ever in them, meaning the grown trash item 
had the wrong loc and causing a runtime.

I also took the opportunity to autodoc.
2019-07-17 18:06:02 -07:00
bgobandit
d1ebea42b5 Composting and grinding now drops trash items if applicable (#44946)
Fixes bowls being lost when composting or grinding food in bowls.
2019-07-04 12:52:37 -07:00
ShizCalev
6e44bd3a93 Merge pull request #44796 from kingofkosmos/addswarningspans
Adds warning-spans
2019-07-02 00:47:43 -04:00
Emmett Gaines
48f19baba1 Randomizes lavaland atmos (#44427)
This makes lavaland atmos random per round. You won't get eternally burning hell worlds or vacuums but it's nice for a bit of variety.

Admins can edit the gas mixture for all of lavaland at once if they want to ruin some miners' day.

image

cl
add: Lavaland atmos is no longer a preset gas mixture and varies per round
tweak: Bonfire minimum oxygen content has been reduced
/cl
2019-06-29 21:07:26 +12:00
nemvar
b83eca4647 Fix sharpness-related issues (#44830)
Turned off energy weapons can no longer cut down trees, destroy wooden
walls, harvest lavaland plants and make planks.
2019-06-27 21:19:33 -07:00
vuonojenmustaturska
a61b86a052 fixes2 (#44736) 2019-06-27 14:13:19 +02:00
kingofkosmos
c969f6d3eb Merge branch 'master' into addswarningspans 2019-06-27 15:12:54 +03:00
kingofkosmos
ec5c82029a * "Is already...", "Can not...", "Not when..." etc. 2019-06-27 06:15:43 +03:00
kingofkosmos
d7dd679b5a Fix span endings (#44812)
Adds a slash to instances of <span>" --> </span>".
2019-06-26 15:11:03 -07:00
kingofkosmos
fb9731492c * extra spaces removed from "span class = '" --> "span class='"
* warning-spans added to cases of "You need..."
2019-06-25 21:03:25 +03:00
XDTM
114628ad7c Fixes antimagic not working in hand slots (#44606)
* Fixes antimagic not working in hand slots

* proper changes

* Update code/modules/mining/lavaland/necropolis_chests.dm

Co-Authored-By: Emmett Gaines <ninjanomnom@gmail.com>
2019-06-24 10:31:11 -04:00
vuonojenmustaturska
8ddc9677c7 examine-code refactor (#44636)
* 1/4 done? maybe?

* more

* stuff

* incremental stuff

* stuff

* stuff & things

* mostly done but not yet

* stuffing

* stuffing 2: electric boogaloo

* Git Commit and the Kingdom of the Crystal Skull

* make it actually compile

* found more stuff

* fixes

* fix AI laws appearing out of order

* fix windows

* should be the remaining stuff

* this time for real

* i guess it should compile too

* fix sechuds
2019-06-19 22:07:57 +02:00
ShizCalev
cf3c67af7c Merge pull request #44615 from nemvar/3dorang
Fixes 3d orange.
2019-06-18 23:27:08 -04:00
nemvar
5917316550 Fixes lavaland flora. (#44558)
* welp

* h

* fixes lavaland flora
2019-06-18 21:19:52 +02:00
nemvar
0018b4980e 3dorang 2019-06-18 01:56:59 +02:00
nemvar
d9761d448d Adds primal farming implements. (#44388)
About The Pull Request

Adds a rake (reskinned cultivator) and a wooden hatchet to the ashwalker base. Replaces their bucket with a wooden bucket.

Added crafting recipes for the rake and wooden bucket.
Why It's Good For The Game

It looks more flavourful (inb4 where did they get the wood from) and adds a bit of functionality to unused content (i.e. ashwalker farming).
Changelog

cl
add: Added wooden farming implements to the ashwalker base.
add: Makes rakes and wooden buckets craftable.
/cl
2019-06-17 13:34:15 +12:00
nemvar
2dad9cf304 nico nico nii (#44390) 2019-06-10 11:46:13 -04:00
granpawalton
d7fda66cd9 Adds corpse flowers (#44322)
* corpse flower init

* icons

* fixes some bad math

* removes istype helper

* play test changes

* examine text

* .

* found where the conflicts happened

* same
2019-06-07 13:57:14 -04:00
Tlaltecuhtli
dab6944369 adds bamboo and fixes sugarcane (#44192)
* 1

* 2

* oh fuck

* kjhgfdfghj
2019-06-06 22:06:47 +12:00
Emmett Gaines
c3f95024b2 Gets rid of the GetComponent macros (#44220)
* Removes the GetComponent macros

* Regex replacement for GET_COMPONENT

Search: `GET_COMPONENT\( *(.+?) *, *(.+?) *\)`
Replace: `var$2/$1 = GetComponent($2)`

* Regex replacement for GET_COMPONENT_FROM

Search: `GET_COMPONENT_FROM\( *(.+?) *, *(.+?) *, *(.+?) *\)`
Replace: `var$2/$1 = $3.GetComponent($2)`
2019-06-04 17:39:58 +02:00
kingofkosmos
1bf60bbe06 Adds missing </span>'s. 2019-06-02 21:29:14 +03:00
vuonojenmustaturska
6a106bc877 Remove reagent ids and use typepaths where applicable (#44166)
cl Naksu
code: reagent IDs have been removed in favor using reagent typepaths where applicable
fix: mechas, borg hyposprays etc no longer display internal reagent ids to the player
/cl
2019-05-31 21:57:26 +12:00
Ghom
17b3091867 Merges tinfoil (hat) protection into the anti_magic component. Implements it on Hivemind gamemode and telepathy. (#43978)
About The Pull Request

Was fairly shocked to find out hiveminds never took tinfoil hat protection in account, so decided to implement the factor in the game mode. Might have overdone it and probably erroneously changed a couple logics while getting rid of some really indented passages that could easily early return.
So what's said on the tin, this is lot more preferable than clunky is_type() checks on headwear anyway.
Also expanded tinfoil protection to hivemind and (non-revenant) telepathy.
Why It's Good For The Game

Let us remember the "purpose" of tinfoil hats.
Changelog

cl
code: Merged tinfoil hat kind of protection into the anti_magic component.
add: Tinfoil hats can also be warped up from excessive dampening of mindray/though control/psicotronic anomalies, or by simply being microwaved in an oven, and become useless.
add: Immortality Talisman and Paranormal Hardsuit helmets now come with tinfoil protection too (minus the paranoia and limited charges).
balance: Rebalanced many hivemind effects to be dampened/delayed by tinfoil shielding. Bruteforced Assimilate Vessel, One mind and Awake Vessel abilities will consume more tinfoil charges compared to others.
balance: Genetics/Slime/Alien Telepathy and Slime Link are now stopped by tinfoil protection.
/cl
2019-05-30 20:29:30 +12:00
nemvar
a37923ceb8 Makes podcloning transfer quirks. (#44001)
* Lolwut

* Update other_reagents.dm
2019-05-19 13:04:20 -04:00
Strommer Kilian
ebfec0c044 typo fix (#43968) 2019-05-16 14:50:36 +02:00
jegub
27c0b5bc32 Resets the lastproduce variable on plant death/removal (#43886)
* Changes maturation and production speed of grasses to avoid failure to reach harvest.

* Resets lastproduce var on plant death/removal
2019-05-14 13:19:52 -04:00
Krysonism
9dd94322ef Adds 10 new drinks, some food reagents and goofconomizes champagne (#43825)
* Adds 10 new drinks + related stuff.

* Update code/modules/reagents/chemistry/reagents/alcohol_reagents.dm

Co-Authored-By: Krysonism <49783092+Krysonism@users.noreply.github.com>

* Update alcohol_reagents.dm

* Fixes the pwr game soda I messed up

* gives champagne the intended price

* Tries to fix the atrocious spelling and grammar

* Adds period

* Tries to appease cobby

Removes Mandela(RIP)
Makes misc changes cobby wanted to the best of my limited ability.

* Taking "catsip" out behind the shed

The drink catsip has been axed. Rest in peace.

* Reworks turbo to be more unique

Turbo no longer boosts your speed, but instead restores stamina based on how drunk you are. Enjoy responsibly, or get shitfaced and fight with security.
2019-05-13 16:46:52 -04:00
Strommer Kilian
5b825255a1 add 3d orange for real this time (#43896) 2019-05-12 15:21:14 -04:00
vuonojenmustaturska
fb45b7a017 Turns trait accessors into defines, fixes some bugs (#43820)
It's free performance.
2019-05-06 19:44:05 -04:00
blessedmulligan
9f2e55e83c Adds garlic (#43815)
* adds garlic, garlic bread, and garlic juice (reagent).

Changes khinkali (a meat snack) to require garlic in its crafting, added some nutriment to khinkalis.

* reduces garlic juice healing to bring it more in line with sprinkles/banana juice/nothing. Still gives a bit more HP, but much, much slower

* Garlic juice now prevents vampires from draining you, stuns vampires if in their bloodstream.

Also fixed garlicbread sprite

* fixed typo

* Update code/modules/mob/living/carbon/human/species_types/vampire.dm

Co-Authored-By: blessedmulligan <30278162+blessedmulligan@users.noreply.github.com>

* Cleaned up isvampire

thanks cobblestone-senpai

* Rebalanced metabolism time, cook heal, vampire effects, and stink rate

* typo

* typo
2019-05-06 10:50:11 -04:00
oranges
ae5896749e Biogen locator nolonger has an unscoped locate (#43793)
Relies on PR 43792 merge that first
2019-05-06 08:38:35 +02:00
oranges
223e5429ef clamp the biogen amount to within the limits allowed by the UI (#43792) 2019-05-03 13:20:15 -04:00
81Denton
5892af0f10 Fixes plant tray strange reagent reaction (#43382) 2019-03-29 13:27:08 -04:00
ShizCalev
5310a4892b Improves cloning logging (#43267)
Forgot to log keys as well. Also noticed that cloning was writing the
occupant's mind ref to the field "mind" on the record instead of
"mindref". Corrected that.

Emagging a cloning pod will now leave fingerprints.
Ejecting someone while they're being cloned will now leave fingerprints.
2019-03-21 21:12:01 -07:00
ShizCalev
1ebbab60ec Fix slippery oil never initializing, move some Initialize() to ComponentInitialize() (#43129) 2019-03-16 19:09:47 -07:00
Tad Hardesty
990e2c7bc2 Fix a few junk type annotations (#42985) 2019-03-07 10:58:05 +01:00
Michael Ashfield
918bd7f450 Adds flyswatter to beekeeper suit storage (#42658)
* Adds flyswatter to keeper suit storage

Lets beekeepers store their flyswatter in their suit

* Added more botanist items

Added normal botanist items that fit into their apron.
2019-02-04 14:50:18 -05:00
4dplanner
cf94e52534 Removes separated chemicals trait (#42386)
cl
del: removed the separated chemicals trait
/cl

I've been meaning to do this for a while. Separated chemicals is mainly used for botany explosives, which are a spammable one hit kill on almost everything. This has been especially bad since I fixed the bug that broke its interaction with squashing.

Botany will still have many tools without these instakills, especially after #42268. This should make botany's weapons both more balanced and more varied.

Smokeplants will still be possible, but will require mutating traits into plants.
In summary, botany needs a nerf in general, and this seems a good place to hit it.
note: EMPs will be lost as well
2019-01-19 10:43:52 +13:00
Jordan Brown
c561d51374 Merge pull request #42268 from recurracy/botany-squashonslip
Slippery skin makes Hypodermic prickles and Liquid contents trigger
2019-01-08 15:24:56 -05:00
Ghommie
3b615fc0a9 Minor reagent_containers clean up on hydroitemdefines.dm (#42264)
* 1

* 2
2019-01-08 09:25:26 -05:00
Recurracy
8a23607d24 Add on_slip procs to liquid contents + hypodermic prickles gene
AKA makes plants squash on slip, and sting on slip
2019-01-07 23:17:59 +01:00
Jordan Brown
c7f6605751 Merge pull request #42131 from 4dplanner/boom
Fixes separated chemicals
2019-01-02 10:24:19 -05:00
4dplanner
b872c9798e Fix squashing (#42135)
Squashed plants now react on the turf they are squashed.

Currently they react on the turf before if they hit a person because they don't
move through the dense object.
2018-12-31 16:04:52 -08:00
4dplanner
e4e36ae705 Fixes separated chemicals 2018-12-30 00:28:59 +00:00
Jordie
c192ece1b3 Merge pull request #41997 from coiax/removes-container-type
Refactors `container_type` into `reagents.flags`
2018-12-23 16:45:10 +11:00
Jack Edge
054647c382 Refactors container_type into reagents.flags 2018-12-18 13:47:11 +00:00
XDTM
9f74fef3d5 Allows the antimagic component to react to spells, limits holymelon uses (#41739) 2018-12-17 19:09:35 -05:00
Denton
877d3cea69 Fixes heat sources not igniting things 2018-12-02 19:06:20 +01:00