Commit Graph

922 Commits

Author SHA1 Message Date
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
kingofkosmos
8358169b8e New 'hear' span class (#46369)
* Reverts italics-span back to no color.

* Cleans up many extra spaces and indents.

* Adds 'hear' span class.

* Replaces all 'italics' used in heard messages with 'hear'.
2019-09-14 23:56:34 -07:00
ATH1909
d4bd86c914 Removes the haloperidol chem from omega weed (EDIT: and makes some other alterations) (#46355)
* Update cannabis.dm

* Update cannabis.dm

* Update citrus.dm

* Update cannabis.dm
2019-09-13 14:18:05 -04:00
oranges
d646640e12 Merge pull request #46391 from nemvar/mekeeakkackkhain
Unscrambles melee_attack_chain
2019-09-09 18:49:54 +12:00
nemvar
84bee81790 Unscrambles melee_attack_chain 2019-09-07 16:12:01 +02:00
81Denton
3547ba9da1 Add killer tomato logging (#46330) 2019-09-06 19:58:02 -07:00
Akrilla
197fd1056c Removes crayon eating colour change (#46210)
* better colours, no eating

* renamed

* powder

* missed renames
2019-09-03 00:30:04 -04:00
Rob Bailey
2029163d33 playsound vary boolean define conversion (#46254)
About The Pull Request

Converts every single usage of playsound's vary parameter to use the boolean define instead of 1 or 0. I'm tired of people copypasting the incorrect usage.
Also changes a couple of places where a list was picked from instead of using get_sfx internal calls

This was done via regex:
(playsound\(.+,.+,.+, ?)1( ?\)| ?,.+\)) to match 1
(playsound\(.+,.+,.+, ?)0( ?\)| ?,.+\)) to match 0
full sed commands:
/(playsound\(.+,.+,.+, ?)1( ?\)| ?,.+\))/\1TRUE\2/ 1 to TRUE
/(playsound\(.+,.+,.+, ?)0( ?\)| ?,.+\))/\1FALSE\2/ 0 to FALSE

I'm not very good with regex and these could probably be optimized, but they worked.
Why It's Good For The Game

Code usability
2019-08-30 18:45:20 +12:00
Tad Hardesty
748bd2dcfd Fix grammar in bamboo log description (#46114)
* Fix grammar in bamboo log description

* Additional bamboo corrections
2019-08-26 21:03:52 +12:00
kingofkosmos
df1fecc58c Adds notice-span to visible_messages with no spans (#46044)
About The Pull Request

Adds 'notice' span class to all visible_messages which had no span class, making all those black messages blue.
Why It's Good For The Game

This should help differentiate action-messages from talking-messages in the chat. More actions will be blue, thus black talking-messages should pop out more.
2019-08-26 20:50:00 +12:00
Rob Bailey
26b04ede42 Obliterates item_color: new washing machine functionality edition (#45961)
About The Pull Request

Completely removes item_color and the clusterfuck of bad programming it caused.

In places where item_color was used for entirely unique purposes it was split off and renamed to a new var on that typepath only, or refactored so it wasn't needed

In places where item_color was used as a dye color, it was converted to the new dye_color var

In places where item_color was used as the worn overlay it was removed and instead now icon_state is always used as the clothing overlay.

A new mob_overlay_icon var was added for manually setting where the mob overlay icon path is for specific items.

Moved some mob overlay files relating to clothing to their own directory as well for organization purposes.

Totally refactors washing machines, instead of the horrible abortion that was iterating through the typepath it now uses a registry of dye results.

Some bonus functionality to come out of this:
the washing machine now supports arbitrary dye colors.
Why It's Good For The Game

It's been 4 years since the "this should be deprecated soonish" comment was added, and this var is a shitpile of confusion if you just trace the usage of it.
Changelog

cl
add: Washing machines now support arbitrary dye color
add: Washing machines now dye nearly every item.
refactor: lots of backend changes to clothing overlays, report any issues
/cl
2019-08-26 20:38:11 +12:00
moo
74ed605cd7 Cobbduceus Part 1/X: Category Twos, Base(d) Healers (#45749)
* 150 hours

* it compiles guys

* PERF

* meta conflictor

* oldcabin

* Revert "meta conflictor"

This reverts commit 812343ca615e5b00711786be4413ce3301cfcc90.

* oldmeta

* TAKE 5000

* NAME THIS

Also redoes Multiver/Palletta

* FRICK U FIZ

* NERF PERF

* comment cringe

* Checks for restraints/incapacitated for ichiyuri

* URIKA

Removes Healing-Scaling of Ichiyuri, Nerfs Healing of Aiuri.

* organ

* please upvote this

* maps...

* Gives Instabitaluri a Brand Name

Oh wow it's synthflesh 😆

* Update cat2_medicine_reagents.dm

* what kinda characters is Krys using
2019-08-22 17:30:16 -07:00
cacogen
334e4d5eaa Can swap out seeds and disks in the plant DNA manipulator with a click (#45975)
Either click the machine itself or the UI fields when it already has seeds or a disk in it
2019-08-21 01:43:31 -07:00
Krysonism
b3399ffe39 [READY FOR REVIEW]Da botany update: Four new plants and plant traits + trait immutability (#45840)
* bungo

* Adds galaxy thistle and spaceman's trumpet.

* Traits update + new mushroom.

Adds new traits and mutability variable.

* Fixes bungo pit contents

* Bungotoxin lethality is now more in line with other good toxins.

* Adds hair dyeing functionality + lowers enzyme

* flags, plant stat adjustments, runtime fix, spelling and mutations.

* Nerfs toxin content of bungo pits to reduce hypodermic induced lethality

* Name getter fix, adds rarity, better documentation, carnivory tweak

* Bungotoxin has more tells.

* fixies
2019-08-20 16:00:52 -04:00
cacogen
cd458890e1 Renaming seeds (#45914)
You can click seeds with a pen to change the name of the plant, the seed's description, or the plant's description. After planting in a hydroponics tray the tray updates with the name and description of the plant inside it.
2019-08-17 23:46:51 -07:00
CRITAWAKETS
0b63bdbb1e Makes ammonia better at increasing plant yield. (#45796)
Ammonia now takes 25u to increase yield by 1 instead of 100u
2019-08-13 12:23:18 -04:00
nemvar
78ac5bbdb3 Capitalizes Gaseous Decomposition (#45729) 2019-08-06 21:42:23 -07:00
spookydonut
88eca69eb5 converts some spawns into timers (#45429)
* converts spawns into timers

* linter

* change per review
2019-07-29 02:23:15 -07:00
MMMiracles
cded323274 Adds Hat Throwing (#45355)
* adds hat throwing on people and borgs

* clothing flags, hats can knock off non-items, borg hat blacklist check

* prevents hats with items in them from being able to land on heads

* removes extra equip, hats can go on the hatless again, tinfoil fix

* if

* bit flag
2019-07-26 15:23:56 -04:00
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