Commit Graph

611 Commits

Author SHA1 Message Date
Joan Lung
a73cb2cfce Not Bioluminescence 2017-03-06 20:41:36 -05:00
Joan Lung
08cc485e98 glowy shit 2017-03-06 20:35:57 -05:00
Joan Lung
10100f1d9f Glowshrooms now have colored light 2017-03-06 13:19:40 -05:00
PJB3005
a63608d023 Merge remote-tracking branch 'upstream/master' into rebase-to-vg 2017-03-03 16:31:00 +01:00
ExcessiveUseOfCobblestone
dcaeccf2b3 Fixes Gatfruit (#24469)
* Oh Cyberboss

* Update grown.dm
2017-02-28 18:04:12 +13:00
militaires
ac701e9299 Merge branch 'master' of https://github.com/tgstation/-tg-station into more_3/4
# Conflicts:
#	code/game/machinery/cloning.dm
2017-02-24 11:54:55 +03:00
coiax
05026eee88 Taste (#24323)
* Adding taste to reagents

* Toxins mostly taste bitter.

* The taste of medicine is mostly bitterness

* Drugs taste bitter too

* It turns out pyrotechnics mostly taste like burning

* Alcohol and blob tastes

* Drinks taste mostly of drinks

* And the food reagents are the last, but not least

* Actual taste code

* You can now taste freshly spawned carrot cake

* Bread, burgers

* Debugging tasting

* Always add the reagents properly, I guess

* Finally got nutriment scaling working

* Finally got all the stuff working and mixing

* PEOPLE CAN NOW TASTE THINGS

* Mouthful only has one L

* Meat n dough

* Eggs and cakes

* Meat dishes taste of meat

* Others...

* Pastry... there is no end to the food

* PIE AND PIZZA

* SANWHICHES, SALAD, SOUP

* THE LAST OF THE FOODS ARE COMPLETE

* Weird indentation issues fixed

* Remove dat debug code

* Hydroponics and sugar is less strong

* Replaces carrot cake reagents

* Code review

* Fixes bad flavours
2017-02-23 00:59:34 -06:00
Cyberboss
56a6eaa8e6 Overlay queuing (#23922)
* Overlay queuing

* Fix SS flags

* Don't copy on assignment

* Flags processing

* Fix icon_smoothing

* MSO's helper proc

* Legacy detection

* Make it work

* Fixes shitcode

* Fix the flag

* |= -> +=

* OK, how did I fuck that up?

* shitcode

* Conditional assoc queue while initializing

* Cleanup everything

* Orange meme

* This isn't perfect, but its the best byond will give us.

* forgot about dir

* oh ya

* This was litterally the last thing i did last night before heading to bed

You can tell can't you?

* Fixes various shit

* Let's not ever pause

* Fix the flag

* Cleaned up some missing shit. Added image dummys

* Remove the one usage of FPRINT

* Jesus get rid of this
2017-02-22 21:44:55 +13:00
militaires
a9c0e59aba pls 2017-02-20 23:06:05 +03:00
Pieter-Jan Briers
b5b93e51f7 Merge remote-tracking branch 'upstream/master' into rebase-to-vg 2017-02-18 16:52:07 +01:00
bgobandit
b22e689417 Fixes some more goddamn typos and bad writing. (#24095)
* fixes some more goddamn typos

* ree

* ...

* seething hatred for typos

* wew
2017-02-17 14:10:58 +13:00
XDTM
6d1b976cbf Adds a bluespace crystal material, balances some R&D recipes around it. (#23984)
* Everything

* FAKE CRYSTALS

* make up your mind

* eat your bluespace, dear

* Reverts upload board cost, increases power of reaction_mob teleport
2017-02-17 09:50:49 +13:00
PJB3005
8ce6ae2b87 Merge remote-tracking branch 'upstream/master' into rebase-to-vg 2017-02-08 14:30:23 +01:00
Cyberboss
b86e224571 Makes qdeleted and qdestroying macros (#23666)
* Makes qdeleted and qdestroying macros

* Makes QDELETED and QDESTROYING uppercase

* Swap qdel checks istype's for != null's

* Fix it

* How was this missed?
2017-02-06 00:59:27 +13:00
Pieter-Jan Briers
aeb057579e Hey it almost works 2017-02-04 01:00:12 +01:00
oranges
ea7e81deb5 Merge pull request #23453 from Fox-McCloud/plant-analyzer
Plant Analyzer Info Tweak
2017-01-31 09:30:06 +13:00
Cyberboss
3f7f5d4000 Removes/Refactors /mob/unEquip (#22918)
* Part1

* IT COMPILES!!!!

* Fuck wait this was missing from that last

* Update handlabeler.dm

* Update handlabeler.dm

* Fixes n shit

* Fix this

* Fixes #23310

* Fucking @RemieRichards was right

* Fixes devil unEquip

* WTF ARE BITFLAGS?

* THERES THE FUCKING PROBLEM

* Fixes
2017-01-31 09:28:31 +13:00
Fox McCloud
06564598ee Botany Fixes (#23404)
* Botany Fixes

* styling

* further fixes

* explosive vine fix
2017-01-29 13:41:52 +01:00
Fox-McCloud
effa9cc55e Plant Analyzer Info Tweak 2017-01-29 03:29:55 -05:00
Joan Lung
10d429ca72 Merge pull request #23252 from KorPhaeron/planks
Fixes trees runtiming when cut into planks
2017-01-23 18:00:27 -05:00
KorPhaeron
fc9646b7a9 Fixes trees runtiming when cut 2017-01-22 16:45:39 -06:00
Fox McCloud
5e20406cfe Alters Dried Jerky and Raisins (#23121)
* Alters Dried Jerky and Raisins

* redundant.
2017-01-21 22:31:25 -05:00
PJB3005
e2386a8bd8 Have some code 2017-01-17 22:54:05 +01:00
PJB3005
7356e80484 hey that should be everything except making it compile. 2017-01-17 22:08:27 +01:00
TehZombehz
d0d24621ad Various Tator Tot Fixes (#22702)
* Various Tator Tot Fixes

Fixed missing sprite, some minor punctuation, and potato wedges not
properly processing into fries.

* More grammatical fixes

Removes an extra 'the' and capitalizes one sentence.
2017-01-06 09:53:45 +13:00
Firecage
8dab2c9c34 Changes the names of Circuit Boards so they are easier on players. (#22688) 2017-01-04 17:20:53 -05:00
Firecage
50bbf5aa50 Allows syringes and droppers to show their reagents when examined while wearing things such as Science Goggles. (#22618)
* Allows syringes and droppers to show their reagents when examined.

* rearranges my logic

* replaces SEMIOPENCONTAINER with TRANSPARENT

* Silly spelling error fix.

* Moves the defines from flags to container_type to avoid issues with conflicting flags

* changes it back to obj/item/O

* Moves the OPENCONTAINER and TRANSPARENT defines to the reagents.dm
2017-01-04 20:00:46 +13:00
Kyle Spier-Swenson
bee4b132a3 [READY]Makes addtimer use callbacks (#22660)
* Makes addtimer use callbacks

* I broke the comment

* I fucked up the regex

* this was a silly idea.
2017-01-04 16:02:56 +13:00
ExcessiveUseOfCobblestone
d0d3f94710 Update seeds.dm (#22407)
> you can make 100 weeds spawn 100% every update

no wonder this was broken.

🆑 Cobby
:bugfix: Fixed Kudzu
:bugfix: Fixes an issue where you can never get below 2 production without disks.
/🆑

This changes weedrate to cap at 10 [meaning at most 10 weeds can spawn at a SINGLE time]
changes weedchance to cap at 67% [meaning at most there's a 2/3 chance `weed_rate` weeds will spawn]

also changes production to 1, since the minimum has always been 1.
2016-12-24 18:57:40 +13:00
ExcessiveUseOfCobblestone
9d673c93f5 Allows Hydroponic Trays to be renamed
🆑 Cobby
:tweak: Hydroponic Trays can now be renamed with a pen. Good for labelling your deathplants as super healing plants and the like!
/🆑

For the daisy holmes botanists, this makes public trays useful. Especially with the gene manipulation device, it can be hard to tell what the purpose of the plant is [healing plant, death plant, etc.], this hopes to alleviate [or, if antag, purport] that issue.
2016-12-19 12:12:10 -05:00
XDTM
7d1a67d0c8 Abductor tools and tool sound refactor. (#22125)
* Everything in the PR

* I'm taking that as a yes
2016-12-14 18:09:41 +13:00
Fox McCloud
11351543ee Adds Random Seeds and a New Trait and Further Gene Datumizing (#22050)
* Adds Random Seeds and a New Trait

* duplication

* weed rates and chances

* fixes rates

* faster random reagents
2016-12-13 15:00:42 +13:00
Joan Lung
43ce2667f4 Merge branch 'master' of https://github.com/tgstation/tgstation into multiplierspeed 2016-12-09 18:03:43 -05:00
Joan Lung
a3be7a9226 Refactors toolspeed to be a multiplier instead of a divisor 2016-12-09 16:55:51 -05:00
oranges
ce631dd259 Merge pull request #22034 from MisterTikva/patch-4
Fixes capitalization and changes names of the new plant traits a bit
2016-12-10 10:34:08 +13:00
oranges
b07e7d2f88 Remove botany "mines" trait as it is sadly too powerful (#21995) 2016-12-08 15:03:48 -05:00
MisterTikva
93d4f68c2b Update plant_genes.dm 2016-12-08 12:56:43 +05:00
Fox McCloud
be94e4f76a Converts Hydroponics oneharvest var and Potato's Battery Quality into Plant Genes (#21983)
* Converts Hydroponics oneharvest var into a Plant Gene

* plant batteries

* plant types

* stinging
2016-12-08 12:43:23 +13:00
MisterTikva
78c7d89110 Fixes gatfruit and ghost chili names (#21968)
* Update chili.dm

* Update misc.dm
2016-12-07 22:27:51 +13:00
MisterTikva
0db492b1dd Implementing unused hydroponics code and some other botany tweaks. (#21938)
* Update plant_genes.dm

* Update berries.dm

* Update pumpkin.dm

* Update melon.dm

* Update root.dm
2016-12-07 09:42:21 +13:00
Mervill
3f68bd7202 Merge branch 'master' into a_intent
Conflicts:
	code/modules/mob/mob_defines.dm
2016-12-04 00:38:37 -08:00
XDTM
62e5f34d41 fix (#21894) 2016-12-03 17:25:05 -05:00
Razharas
4993e2146b Merge pull request #21888 from XDTM/VineCodeScaresMe
Fixes a couple of kudzu bugs
2016-12-03 21:26:17 +04:00
Mervill
0972f78800 a_intent now uses defines 2016-12-02 22:27:30 -08:00
Mervill
09ea5ad2e5 w_class now uses defines 2016-12-01 21:33:14 -08:00
XDTM
fc8d1d6be3 Fixed bugs 2016-12-02 00:46:49 +01:00
MrPerson
1ac2fcb5ea Snack trash generation rework
Quick and ugly but it's OO so fuck you.
\>typecasting src
smh

Fixes #21583
2016-11-27 22:01:00 -08:00
oranges
3f667205e8 Merge pull request #21611 from Cruix/grass_fix
Fixed grass on the ground giving too much astroturf
2016-11-19 22:35:17 +13:00
unknown
355133e0a4 Fixed grass on the ground giving too much astroturf, cleaned up grass code. 2016-11-17 20:18:50 -06:00
NikNakFlak
b9a9695793 HELP AFTMAINTENENCE TRAITOR! EBO! ACK! 2016-11-16 16:04:24 -07:00