Commit Graph

945 Commits

Author SHA1 Message Date
ArcaneMusic 59ff677b9d Initial Commit. (#49484) 2020-02-25 16:34:30 +01:00
ShizCalev 7209ac3c93 Removes unnessacary math defines 2020-02-17 23:09:09 -05:00
cacogen 07eea73ae0 Soil is no longer called hydroponics tray when something is planted (#49304)
* Soil is no longer called hydroponics tray when something is planted

- Simplifies tray renaming and reduces the copypasted code by making it a proc
- Removes description changes, couldn't make them work grammatically with the plant name and they don't make sense on their own
- Makes soil PLURAL gender so it's referred to as some soil instead of a soil
- Removes unnecessary setting of a seed's productdesc when planting, it already gets that when customising it with a pen and that's the only time it's relevant
- Updates the tray name when weeds are mutated, which didn't used to happen

* uses a define instead of a proc
2020-02-13 10:39:52 +01:00
Capsandi 799969aa51 Death Nettle Grammar Fix (#49312)
* Fixes Death nettle grammar

2 lines, the start of my awesome coder career

* Oh god i fucked it up why god why
2020-02-13 10:35:03 +01:00
Jordan Brown ce9577663a Merge pull request #49173 from ninjanomnom/material-lazy-init
Makes the global materials lookup lazily initialized
2020-02-04 11:05:59 -05:00
Emmett Gaines 2cf7728494 Removes the bitflag helpers (#49106) 2020-02-03 16:26:00 -05:00
skoglol 60820383ec Cleans up beaker swapping (#49126) 2020-02-03 13:09:01 -05:00
Emmett Gaines ab3a127295 Makes the global materials lookup lazily initialized 2020-02-03 10:17:13 -05:00
skoglol 988f8bcb03 Adds some rudimentary hypodermic prickles logging. 2020-01-31 00:46:22 +01:00
OnlineGirlfriend 7f081640a3 [READY] Adds pineapple juice, creme de coconut, Pina Colada; adds Painkiller drink; adjusts Bahama Mama and pineapple snowcone (#48783)
This adds two drink ingredients: creme de coconut (a coconut liqueur obtainable in the booze dispenser) and pineapple juice (obtainable in the soda dispenser or via juicing pineapples). It further adds the Pina Colada and Painkiller cocktails & corresponding sprites, and it adjusts the recipe for Bahama Mama. The recipe for pineapple snowcones was also adjusted to require pineapple juice rather than pineapple slices.

Finally, pineapple juice can be found in a carton or craftable juice box, and I've added sprites for this.
Why It's Good For The Game

First off, more drink ingredients equal more realistic drink mixes and more variety, which means more fun for bartenders.

Pineapple snowcones are better off using pineapple juice as opposed to pineapple slices. Previously the recipe called for two pineapple slices; you can now juice those two pineapple slices to produce pineapple juice sufficient for the snowcone.

Regarding the changes to the Bahama Mama recipe: With these changes, the recipe now more closely represents the classic Bahama Mama, which involves coconut, coffee, rum, and pineapple juice as its base ingredients. I removed orange juice to prevent conflict with the Painkiller recipe, but also feel justified in doing so because orange juice is not an essential ingredient of a Bahama Mama, nor is lime.
Changelog

🆑
add: pineapple juice, creme de coconut
add: Pina Colada cocktail
add: Painkiller cocktail
add: pineapples and pineapple slices can be juiced
tweak: Bahama Mama recipe, pineapple snowcone recipe
imageadd: pineapple juicebox sprite, pineapple juice carton sprite, Painkiller sprite, Pina Colada sprite
/🆑
2020-01-29 11:45:21 +13:00
spookydonut ac7f2b5166 Fix Crossed/Entered/Exited/Bump/ui_act parameter casting (#49016)
About The Pull Request

Detected as part of my work on SpaceManiac/SpacemanDMM#167
2020-01-28 10:51:15 +13:00
Rohesie 7bef84f009 Mass-replacement of stat to machine_stat (#48758)
Living and machine stat vars are pretty different, one uses flags and other number-defines.
This should make some other mass-replacements and searches a bit easier.
2020-01-24 12:37:17 +13:00
ArcaneMusic b62d105228 Adds the Wood Datum Material, giving it to items made from wood. (#48820)
* Initial commit, wood datum mat. Works on my machine.

* Wait this makes baseball bats worthless nevermind

* Review changes, uses the define now, just don't know how bitflags work well enough for that other bit

* Adds the material dependance check

* FINE
2020-01-23 17:36:10 -05:00
MrPerson 26093e5ac2 Further update_icon splitup (#48784)
* Further update_icon splitup

After this there'll be just under 100 old update_icon() calls that need fixing.

* Thanks Travis
2020-01-22 10:18:05 -05:00
skoglol d33d8a7c06 Adds alt click to grinder, biogen. (#48893) 2020-01-21 18:31:54 -05:00
81Denton 3849a4a42c Replica pods can show the blood DNA of injected samples (#48755)
* Replica pods notify ghosts, can show the blood DNA of injected samples

* basically im monky

* h

* removes garbo, adds hints that "blood DNA" is just the UE
2020-01-20 11:44:38 -05:00
MrPerson f7eb2c905b Unicode awareness Part 2 -- copytext() (#48512)
* Unicode support Part 2 -- copytext()

This is the transition of all copytext() calls to be unicode aware and also some nearby calls in the same functions. Most things are just replacing copytext() with copytext_char() as a terrible character limiter but a few others were slightly more involved.

I replaced a ton of
````
var/something = sanitize(input())
something = copytext(something, 1, MAX_MESSAGE_LEN)
````

with a single stripped_input() call. stripped_input() already calls html_encode(), trim(), and some other sanitization so there shouldn't be any major issues there.

This is still VERY rough btw; DNA is a mess, the status displays are complete ass, there's a copytext() in code\datums\shuttles.dm that I'm not sure what to do with, and I didn't touch anything in the tools folder. I haven't tested this much at all yet, I only got it to compile earlier this morning. There's also likely to be weird bugs until I get around to fixing length(), findtext(), and the rest of the string procs.

* Makes the code functional

* Assume color hex strings are always # followed by ascii.
Properly encodes and decodes the stuff in mob_helpers.dm which fixes some issues there.

* Removes ninjaspeak since it's unused
2020-01-18 13:07:22 +13:00
AnturK bca492823a Runtime fixes: Episode 113 (#48814)
* Fixes mood nanite settings

* Fixes yet another quirk runtime.

* Ugly paperplane fix

* Abductor armor runtime.

* cablecutting runtime

* Nukeop death runtime (were those spec deaths meant to fire on gibbing too ? )

* headpike runtime fix

* ERT outfit runtime

* bonfire oxygen runtime

* Rest of nanite updates
2020-01-16 11:16:37 -05:00
Emmett Gaines 53024590de Can pass refactor (#48659)
* Makes all CanPass procs call parent

* Makes CanPass more extendable and gives the mover a say in the matter

* Replace CanPass with CanAllowThrough to use the new system

Regex replace `(?<!proc)/CanPass\(` => `/CanAllowThrough(`

* Simple optimization pass
2020-01-08 21:31:49 +01:00
skoglol ecec06a83d Fixes shadowshrooms (#48543) 2020-01-06 21:50:01 -05:00
swindly 0e2b4e1977 Adds logs as parts of bonfires and blacklists steel-caps from them (#48312)
* blacklists steel logs from bonfire

* adds logs as bonfire part
2019-12-21 16:43:36 +01:00
tralezab 82f7330833 ice peppers renamed to chilly peppers (#48289)
* 1

* 2
2019-12-18 20:20:23 -05:00
spookydonut f3a99558c3 Removes some dead/unused code (#48158)
* cleans up some deadcode

* ancient

* goon icons

* rice and garlic

* more

* last one

* fuuuuuuuuuuuuuuuuuucking subtypes
2019-12-15 14:09:02 -05:00
nianjiilical bc45b1b079 Properly removes electric limes (#47758)
oops
2019-11-14 18:05:27 -05:00
Firecage 9543ab6b1c Plants in Gaia'ed hydro trays are no longer taken over by weed… (#47722) 2019-11-13 03:03:56 -08:00
spookydonut 2591ce17a6 Travis EOF newline detection v3 (#47539)
* scream

* aaa

* aaa

* new one
2019-11-04 19:16:50 -08:00
AnturK b63500838f Cleans up plante gene mutability. 2019-10-31 14:28:52 +01:00
ATH1909 cbe197b902 Fixes the name conflict between the two different kinds of black powder in a different way (#47288)
* Update pyrotechnic_reagents.dm

* Update pyrotechnics.dm

* Update reagent.dm

* Update misc.dm
2019-10-25 02:39:10 -07:00
Krysonism 59a0440acf Da white kit nerf update: sutures and regen mesh. (#47092)
* Base

* epic

* bandaid begone

* Documentation

* Bugmash

* Replaces bruise packs and ointment in on maps.

* Fixes for testmerge

* new line

* Dirty web

* Nasty webedit

* med suture is now a chemical recipe, adds cellulose reagent
2019-10-20 13:18:42 -04:00
81Denton f5bd6a381d Merge pull request #47052 from kingofkosmos/misc_span_fixes1
Misc span fixes
2019-10-20 18:46:54 +02:00
DeAndre a9b1ada28c Merge branch 'master' into Somethingforthekids 2019-10-20 13:26:13 +02:00
kingofkosmos 56b8461580 Fixes. 2019-10-19 22:17:50 +03:00
moo 940606a239 Adds new bioluminescent traits and mutations (#46986)
* Adds new bioluminescent traits and mutations

Because 'puke green' shouldn't be the only light color.

* Adds new bioluminescent traits and mutations

Because 'puke green' shouldn't be the only light color.

* Adds new bioluminescent traits and mutations

Because 'puke green' shouldn't be the only light color.
2019-10-18 19:49:24 -04:00
nianjiilical 6677fdc358 Merge remote-tracking branch 'origin/bioluminescence' into bioluminescence 2019-10-18 03:49:48 -03:00
kingofkosmos 280d416d4f Adds missing spans, missing periods and missing span endings. Also changes spans to suit the situation better. 2019-10-12 19:34:11 +03:00
nianjiilical 434bba9775 Adds new bioluminescent traits and mutations
Because 'puke green' shouldn't be the only light color.
2019-10-10 18:05:01 -03:00
nianjiilical 7a51976253 Merge remote-tracking branch 'origin/bioluminescence' into bioluminescence 2019-10-10 17:51:28 -03:00
nianjiilical 8eaea8e031 Adds new bioluminescent traits and mutations
Because 'puke green' shouldn't be the only light color.
2019-10-10 17:50:58 -03:00
nemvar c38a7a3bb5 Removes a bunch of var/ in procs (#46946)
* Removes a bunch of /var in procs

* reset this

* Why wasn't this already?
2019-10-10 04:20:27 -07:00
nianjiilical 4de660946e Adds new bioluminescent traits and mutations
Because 'puke green' shouldn't be the only light color.
2019-10-09 03:21:23 -03:00
Qustinnus a394ccdc2b Material datum chairs & tables and applies materials to all items (Now with less pain for mining & RnD) (#46525)
removes materials list from items, uses custom_materials instead. This might introduce some bugs so we should testmerge this for a while (and Ill test stuff locally as much as I can)

this also adds material crafting to sheets. Test case being chairs. In the future we can add stuff like tables, walls, doors etc.

also applies materials to everything, with fixes, which can close #46299
2019-10-08 11:06:02 -04:00
Mickyan 7397fac01a Clowns don't get along with rakes (#46834)
* deughrgh

* typo

* typo 2
2019-10-07 15:58:39 -04:00
nemvar a148cae769 Kills obj/item/projectile in favour of obj/projectile (#46692)
* Kills obj/item/projectile in favour of obj/projectile

* Resolves conflicts properly

* fixes that one map

* it lives
2019-10-06 13:37:24 -04:00
DeAndre 75f28898a3 donuts 2019-10-05 15:27:39 +02:00
nemvar daffaefb71 Switches out the three billion args of electrocute act for flags (#46564)
* Switches out the three billion args of electrocute act for flags

* Adds autodoc to electrocute flags, sets the boolean I removed and tries to fix the ed209 file

* tries to fix ed209 again

* Fixes 209 hopefully

* Finally fixes that darn file

* one final one to fix the diff

* Or i guess i'll just do it myself
2019-10-02 23:14:19 +02:00
ATH1909 90d6008ad4 Plant Chems now have a minimum of 1u instead of hardadding 1u after potency calc (#46727)
* Update seeds.dm

* Update seeds.dm
2019-10-02 14:09:27 -04:00
Fikou f9de9f4e76 fixes rainbow bunch (#46818)
* fixes rainbow bunch

* orange man bad
2019-10-02 12:18:26 +02:00
nemvar dc783795db Renames is_hot and is_sharp to get_temperature and get_sharpness (#46680) 2019-09-23 14:02:59 -07:00
Qustinnus 8c15cc9bf1 fix (#46634)
f
2019-09-22 03:10:14 -07:00
nemvar 8cfe0f6467 Slightly improves visible and audible messages. (#46499)
* Doubtful improvement

* Switches out all the magic numbers with defines

* Thanks travis for finally finding a real error

* properly resolves some left over conflict
2019-09-18 12:52:18 +02:00