a8a1126103
Merge pull request #4097 from Cheridan/ghost_alert
...
Ghost Alerts pt II
2014-07-09 07:47:16 +01:00
8288810ff6
Merge pull request #3531 from Rolan7/Issue3401
...
Fixes issue #3401 by adding a "SpeciesCanConsume" helper proc
2014-07-08 01:45:36 -05:00
4574a85b05
Merge pull request #4075 from Incoming5643/super_meat_pull
...
Fixes #4073
2014-07-08 00:49:33 -05:00
ed4c58e26f
Ghost Alerts p II
...
runes now properly show the area they're in (oops)
Narsie has been moved into her own file.
2014-07-07 15:21:32 -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
6699761ac3
Correcting a merge error... will probably squash this once I know things are okay.
2014-07-07 13:53:33 -04: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
ffed2a901e
Merge branch 'master' of https://github.com/tgstation/-tg-station into Issue3401
...
Conflicts:
code/modules/mob/living/carbon/monkey/monkey.dm - I don't know why it thought there was a conflict. Opening it in tortoisemerge showed no conflicts and automatically cleared the status. I reset to the repo's version just to be safe, then re-added my freakin 2 line function which has caused 2-3 "conflicts" so far.
2014-07-07 13:47:13 -04:00
0fa91b06f1
Merge branch 'master' of https://github.com/tgstation/-tg-station into Issue3401
...
Conflicts:
code/modules/mob/living/carbon/monkey/monkey.dm - I don't know why it thought there was a conflict. Opening it in tortoisemerge showed no conflicts and automatically cleared the status. I reset to the repo's version just to be safe, then re-added my freakin 2 line function which has caused 2-3 "conflicts" so far.
2014-07-07 13:42:31 -04:00
36ba571447
Merge pull request #4068 from Firecage/Moarbotany
...
Changes to botany plants
2014-07-07 15:43:01 +02:00
e2ca58aa81
Moar empty liiiiiiines
2014-07-07 15:15:43 +02:00
5d91d59fa2
MWAHAHAHHAHAHAHAH
2014-07-07 14:57:24 +02:00
c65b9b7c79
Merge pull request #4062 from Menshin/powernet_machine_connection
...
Powernets machines connection polishing
2014-07-07 11:55:52 +01:00
6fc59fee6e
More spaces because Miauww is a picky ass
2014-07-07 12:52:46 +02:00
6c9144db2b
Merge pull request #4063 from Menshin/solar_control_refactoring
...
Solar control refactoring
2014-07-07 11:48:00 +01:00
ced9dbd479
Merge branch 'master' of https://github.com/tgstation/-tg-station.git into Moarbotany
2014-07-07 11:33:52 +02:00
2830c8c092
Merge pull request #3961 from paprka/ergoisbackohno
...
Improved mining droprates
2014-07-07 10:28:30 +01:00
f88b6a6c4d
Merge pull request #4069 from AstralSerpent/borgment_harmweldhertz
...
Using a welding tool on augmented limbs, cyborgs or bots will hurt while on harm intent, instead of heal.
2014-07-07 10:25:45 +01:00
13c8800618
Fixes Miauw said.
2014-07-06 21:39:37 +02:00
ffe331878f
*Removes the 95% probability chance of any attempt to harvest meat from various simple animals to fail after dropping one meat. This also means the gib animation will always properly play (provided it exists).
...
*Meat spawning removed from harvest(), it's always been handled in gib. Harvest still exists due to some overrides on how it works for certain animals (mostly spiders)
*Fixes #4073
*Keeps me marginally relevent ヽ༼ຈل͜ຈ༽ﾉ
2014-07-06 13:59:15 -04:00
d497387355
Merge pull request #4048 from Kelenius/OfAIAndHUD
...
Gives the AI a simple hud
2014-07-06 12:58:13 -05:00
b1cb6ceeff
Expanded list of what Apron/Coveralls can hold
2014-07-06 19:49:54 +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
10c9d4d14e
Attacking augmented limbs or cyborgs with a welder on harm intent will actually harm.
2014-07-06 02:33:13 +10:00
0819cb12bd
Towercap log/plank shit
2014-07-05 18:03:25 +02:00
ab949b027f
Merge pull request #4058 from AstralSerpent/master
...
Removes an unused suicide_act() on the scalpel and traitor code words will be announced at round end.
2014-07-05 17:44:27 +02:00
69cb378fbc
Added delay and 'prime' message
...
Signed-off-by: Firecage <firecage@hotmail.com >
2014-07-05 17:02:34 +02:00
2c0ac7bfd8
Updoots
2014-07-05 15:56:29 +02:00
92c70b8742
Delegated the panels and trackers control to Solar Control Computers instead of the Sun controller.
2014-07-04 21:42:36 +02:00
559d83c36e
Signed-off-by: Firecage <firecage@hotmail.com>
2014-07-04 16:56:33 +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
7cd52c3b6f
Merge pull request #4046 from Aranclanos/breathruntime
...
Too hot or too cold? Fuck that, I'll runtime once per second. Per human.
2014-07-03 20:00:11 -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
88a99f42f6
Merge pull request #4022 from Miauw62/slotmachine
...
Adds slot machines.
2014-07-03 18:56:08 +01:00
71e1b38eb5
Adds slot machines.
2014-07-03 19:50:22 +02:00
ec3d8164a8
Now uses isturf
2014-07-03 20:30:29 +04:00
a68c426301
Merge pull request #4038 from Cheridan/ghost_notifications
...
Notifications + Random Stuff
2014-07-03 17:29:49 +01:00
09f2699f42
Two fixes
...
Double click made non-snowflake, cancel camera exploit patched
2014-07-03 19:33:46 +04:00
d8ae776f64
Gives the AI a hud
2014-07-03 18:52:11 +04:00
9d075e3cc1
Merge pull request #4031 from Aranclanos/disposalsruntimes
...
disposals mousedrop runtime fix
2014-07-03 13:43:10 +01:00
61200625b5
Fixes the runtimes clogging the logs, handle_temperature() will now use the human on their params.
2014-07-03 03:11:06 -03:00
e65919da42
Removed the now unused directwired variable
2014-07-02 23:58:12 +02:00
b158820043
Fix merging powernet on turf sometimes not connecting machines.
2014-07-02 19:01:11 +02:00
e75372647b
Merge pull request #4034 from Giacom/operate_compu
...
Modernized the UI of the operation computer.
2014-07-02 00:10:05 -05:00
Alex
Cheridan
Rolan7
Swag McYolosteinen
Firecage
Incoming
Ben G.
AstralSerpent
Menshin
Kelenius
Aranclanos
Menshin