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
b18cc7d54e
Merge branch 'master' of https://github.com/tgstation/-tg-station into manidontevenknowwhatwentwrongwiththat
...
Conflicts:
code/game/machinery/doors/airlock.dm
code/game/objects/structures/door_assembly.dm
code/game/objects/structures/false_walls.dm
code/game/objects/structures/mineral_doors.dm
code/modules/research/protolathe.dm
icons/obj/doors/door_assembly.dmi
2014-04-11 02:51:07 +10:00
31d851d315
Such vines
...
So mutation
2014-04-10 07:51:20 +04:00
42308da24d
Merge pull request #3298 from Kelenius/hydrofix
...
Fixing banana peel
2014-04-07 18:39:53 -07:00
b095a3458c
one missing period. derp
2014-04-05 18:02:40 +02:00
2a3924820f
Add message when loading container.
...
* Add message when loading container.
* Change 'beaker' to 'container' (to include buckets)
2014-04-05 18:00:04 +02:00
b7243b94c1
Fixing banana peel
2014-04-03 16:00:07 +04:00
79746e115f
Wooden Walls
2014-04-01 18:03:02 +11:00
1bf9a3ce17
Potency and chemicals fix
2014-03-28 10:20:33 +04:00
22908ee79a
Conflict fix
2014-03-26 12:04:26 +04:00
b91537055a
Small fix
2014-03-26 10:35:25 +04:00
8af8a43d6f
Initial pass to convert LF to CRLF
...
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com >
2014-03-24 08:53:40 +00:00
5c42a433d4
Minor fix
2014-03-11 15:49:53 +04:00
01aacde942
Tray's chemical procession is made into a separate proc.
...
Nutriments again affect plant's mutations and yeild.
Containers will no longer splash their contents at trays and biogenerators (fixes #2992 ).
Almost all spawn() removed from grown creation.
2014-03-09 11:37:13 +04:00
6b29fecda1
Merge branch 'master' of https://github.com/tgstation/-tg-station into qdel_r
...
Conflicts:
code/game/machinery/bots/ed209bot.dm
code/game/machinery/rechargestation.dm
code/game/machinery/turrets.dm
code/game/objects/structures/crates_lockers/closets.dm
code/modules/research/circuitprinter.dm
2014-03-08 22:03:03 -08:00
c548df264b
Conflict fix
2014-03-05 06:30:29 +04:00
1cf3af0d72
Merge pull request #2973 from Kelenius/master
...
Seed extractor as storage
2014-03-04 17:04:22 -06:00
80a7a2abb4
Replaced a few more Del() and del() calls
...
Removed cigarette related reagent deleting. It's already done in atom/Destroy()!
2014-03-03 04:51:09 -08:00
4675af9f19
Seed extractor upgrade
2014-03-03 15:38:16 +04:00
Firecage
Cheridan
Rolan7
CollenN
Kelenius
Jordie0608
Miauw62
Menshin
Razharas
Razharas
phil235
Mloc-Hibernia
MrPerson