792ada6990
Merge pull request #4123 from Rolan7/Issue_4045
...
Glowshroom and irrigation fix
2014-07-21 08:40:38 -05:00
1e35eb0458
Merge pull request #4186 from Ergovisavi/killer_tomato_parasite_fix
...
Fixes issue #4185 - Killer tomatos spawning in mobs/mechs/microwaves/etc
2014-07-21 09:05:21 +01:00
fd5c599d2f
Merge branch 'Biogencode' of https://github.com/Firecage/-tg-station.git into Biogencode
2014-07-20 21:38:01 +02:00
ad5ad41d98
Changes what Miauw said
...
Signed-off-by: Firecage <firecage@hotmail.com >
2014-07-20 21:36:19 +02:00
5a463fafac
Update biogenerator.dm
2014-07-20 21:23:58 +02:00
7779a2f7e8
Signed-off-by: Firecage <firecage@hotmail.com>
2014-07-20 21:10:53 +02:00
fa32b63189
Fixes issue #4185 , Killer Tomatos will now spawn on the turf that the Killer Tomato plant exists in after the awakening process, stopping bizarre things like it spawning inside another mob or in a mech or other assorted silliness
2014-07-17 21:50:47 -07:00
76e9fed50c
Signed-off-by: Firecage <firecage@hotmail.com>
2014-07-15 22:36:54 +02:00
07a16bbbf7
Signed-off-by: Firecage <firecage@hotmail.com>
2014-07-14 06:06:04 +02:00
4db7359cf6
Signed-off-by: Firecage <firecage@hotmail.com>
2014-07-13 22:34:44 +02:00
e13e4ca445
Signed-off-by: Firecage <firecage@hotmail.com>
2014-07-13 22:32:34 +02:00
d5a7885842
Signed-off-by: Firecage <firecage@hotmail.com>
2014-07-13 22:29:37 +02:00
d84d6e573b
Removes wonky luminosity check from soil plots that was causing problems. Was not present in real hydro trays.
...
Puts the irrigation check back to anchored==2 like it's supposed to be. Oops.
Comments the anchored variable in a few places so people don't make the same mistake.
2014-07-09 19:40:00 -04:00
961adb8465
Further Hydro Cleanup
...
Fixes #3880 : Mapped or Adminspawned Growns will take on the default variables of their seed type.
Fixes #3828 : Meteor Pen projectiles are now visible
Some more refactoring, clearing up the growninedible.dm. Deletes hydroitemcode.dm. Keep code with the definitions, ew ew.
2014-07-08 00:22:31 -05:00
0aae810b87
fixes merge issue with killer tomatoes
...
fixes soap
2014-07-07 13:59:59 -05:00
079a13657f
fixing map and growns conflict
2014-07-07 13:29:30 -05:00
065028cf1d
Merge branch 'master' of https://github.com/tgstation/-tg-station into ghost_notifications
...
i am going to murder you miauw
2014-07-07 12:51:56 -05:00
e2ca58aa81
Moar empty liiiiiiines
2014-07-07 15:15:43 +02:00
5d91d59fa2
MWAHAHAHHAHAHAHAH
2014-07-07 14:57:24 +02:00
6fc59fee6e
More spaces because Miauww is a picky ass
2014-07-07 12:52:46 +02:00
13c8800618
Fixes Miauw said.
2014-07-06 21:39:37 +02:00
b5c45a7474
Icons for the Eggyplant and Moneyfruit
2014-07-06 18:13:22 +02:00
c025faa579
Grass tile amount dependent on potency
2014-07-06 17:55:10 +02:00
b47a1d6b32
Eggplant and moneyfruit changes
2014-07-06 01:31:13 +02:00
9bf583ef66
Blood tomato gib spawning
2014-07-05 19:27:41 +02:00
0819cb12bd
Towercap log/plank shit
2014-07-05 18:03:25 +02:00
69cb378fbc
Added delay and 'prime' message
...
Signed-off-by: Firecage <firecage@hotmail.com >
2014-07-05 17:02:34 +02:00
983ac3ed79
Killer Tomatoes
...
Signed-off-by: Firecage <firecage@hotmail.com >
2014-07-04 16:27:54 +02:00
1635b39887
restores ambrosia's description.
2014-07-03 22:56:39 -05:00
52c9abbd27
Growns: The OOPening.
...
Refactors grown.dm to use OO programming techniques.
merge commit
conflict in map
map fix
fixing the map. again. thanks obama.
map commit
wtf
Merge branch 'master' of https://github.com/tgstation/-tg-station into ghost_notifications
map conflict fix. this should work.
updates metastation
2014-07-03 16:43:07 -05:00
2fad91623f
Merge pull request #4037 from Rolan7/Issue3879
...
Hydroponics fixes, icons and irrigation
2014-07-03 13:54:52 -05:00
b02b93ce2a
Notifications + Random Stuff
...
Adds sound notifications for Ninja and Wizard Apprentice spawning -- hopefully means fewer afk antags.
Adds a ghostnotice span class, used in the new notify_ghosts proc. Upon creation, things that require ghostly attention (NarSie, golem runes) give more visible messages to the dead.
Retires the 'moderate' span class, which was only used in tomato throwing? Refactors tomato code (this ended up being the meat of this PR, somehow...)
Reorganizes some item definition/procs.
2014-07-01 23:16:02 -05:00
0fa9561ff0
Syringes will switch to draw mode if emptied into plots.
...
All reagent containers have icon updated after plot-use, including droppers.
Droppers updated to use update_icon instead of that "filled" variable.
Typo in irrigation fixed, allowing liquid > 30 units to be spread amongst connected trays.
Changelog updated, including some things from previous PRs which I didn't add at the time.
2014-07-01 19:38:15 -04:00
7decfe8621
Merge branch 'master' of https://github.com/tgstation/-tg-station into MidJuneBugfixes
...
Conflicts:
code/modules/mob/living/carbon/carbon.dm
2014-06-21 09:00:21 -04:00
f786a6c2c0
Merge pull request #3959 from CollenN/mutrace-final
...
Finalizes Mutantrace Datum Update
2014-06-20 21:47:54 -05:00
2aab5fa71c
Finalizes Mutantrace Datum Update
...
https://github.com/tgstation/-tg-station/pull/3609
Squashes the commits from the above pull request. Should hopefully be a
lot less cluttered.
2014-06-19 17:42:14 -04:00
98367cb162
Changelings can use hivechat while muzzled.
...
Monkey-lings can use hivechat.
Lings can return to human form even if monkeyed through genetics.
One-line fix for Destroying Angels (..() wasn't being called)
Spelling correction in Destroying Angel description
2014-06-17 00:13:56 -04:00
3908160998
One big update for stacks.
2014-06-10 20:36:08 +04:00
ea3d4b35c4
fixing conflict
2014-05-14 10:01:29 -05:00
3073d284ba
Merge branch 'master' of https://github.com/tgstation/-tg-station into vitallyimportant
2014-05-14 09:52:47 -05:00
4761e02904
Maybe i should make sure the code complies before pushing it next time
2014-05-13 02:32:56 +10:00
4078973a5c
Unidentinization
2014-05-13 02:18:21 +10:00
dfd2cc4b60
Changed suicide messages to visible_messages and fixed relative pathing
2014-05-13 01:44:29 +10:00
e2a2b15706
2-unit setting
2014-05-06 19:16:17 -05:00
ab226de343
Makes nutrient bottles larger, reduces amount in vendor/generator to compensate.
2014-05-06 18:55:38 -05:00
eec72aa516
Merge pull request #3472 from Menshin/missing_nodrop
...
Nodrop checks for several machines/structures
2014-05-03 15:44:26 +02:00
9c122c6919
Fragile thrown food items use del instead of qdel. This affects tomatoes, blue tomatoes, blood tomatoes, eggs, and pies. Pies and tomatoes now also apply reagents like the other thrown foods. Fixes issue #3561 .
2014-04-28 02:40:58 -04:00
80e7d1d0e7
Added a check for "_nodrop_" items for several machines/structures ( fix #3407 ).
2014-04-20 20:49:32 +02:00
cae9fa555d
Merge branch 'master' of https://github.com/tgstation/-tg-station into GrabPull
2014-04-11 01:36:49 +04:00
cb5eaf0b10
Tweaks and giggles
2014-04-11 01:36:38 +04:00
Cheridan
Alex
Firecage
Ergovisavi
Rolan7
CollenN
Kelenius
Jordie0608
Miauw62
Menshin
Razharas