6fc59fee6e
More spaces because Miauww is a picky ass
2014-07-07 12:52:46 +02: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
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
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
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
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
e75372647b
Merge pull request #4034 from Giacom/operate_compu
...
Modernized the UI of the operation computer.
2014-07-02 00:10:05 -05:00
7e724a9f65
Merge pull request #3851 from Ikarrus/splat
...
Shuttles docking on you will really hurt
2014-07-01 23:29:05 -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
ddb9955e53
Removed an unused suicide_act proc belonging to the scalpel.
2014-07-02 09:27:06 +10:00
3a7c25572e
Modernized the UI of the operation computer.
2014-07-01 21:20:50 +01:00
ce9773294d
Resolved Conflicts:
...
code/modules/mob/living/carbon/carbon.dm
2014-07-01 13:02:40 -06:00
4fbd7d411a
disposals mousedrop won't runtime if you do it with objects, now they will only accept mobs.
2014-07-01 00:31:10 -03:00
c65aa2b5a4
Merge pull request #4000 from Cheridan/terribleidea
...
MONKEY MODE REDUX
2014-06-30 16:27:22 -03:00
134272b744
Merge pull request #3949 from Rolan7/MidJuneBugfixes
...
Changeling/say code bugfixes
2014-06-30 11:19:59 -05:00
e5bc43d12e
Merge pull request #4008 from advomach/master
...
List lookup to actual math
2014-06-27 19:43:55 -05:00
69ba4e1612
Fixes compilation errors
2014-06-27 09:44:05 -06:00
d3ec4dbf72
Resolving Conflicts:
...
_maps/map_files/tgstation.2.1.3.dmm
code/game/machinery/bots/ed209bot.dm
code/game/machinery/bots/secbot.dm
code/modules/mob/living/carbon/human/human.dm
code/modules/mob/living/carbon/monkey/monkey.dm
2014-06-27 09:30:43 -06:00
6befeed46f
-Giacom's feedback
...
-Fixed secbots being able to stun silicons
-Added an attack cooldown for secbots
2014-06-27 09:25:52 -06:00
0f6e61968a
Merge pull request #4006 from optimumtact/patch-4
...
Override emp_act on the ionrifle
2014-06-27 14:02:17 +01:00
453589785d
Merge pull request #3985 from CollenN/blackfix
...
Fixes Black Lizardmen
2014-06-27 13:58:26 +01:00
a4f4d42a2f
Merge pull request #4013 from Menshin/make_powernets_fix
...
Fixes make_powernets proc
2014-06-27 09:26:10 +01:00
a04d5ffc9e
Merge pull request #3953 from Ikarrus/alienERPfix
...
Humanoid aliens can now strip again.
2014-06-26 09:26:37 +01:00
788a97471f
Fixes _make_pownernets_ proc not adding the first cable found to its cable list.
...
Fixes #4011 .
2014-06-25 15:49:50 +02:00
79447673a0
Update singularity.dm
...
Removed comment
2014-06-24 19:00:41 -04:00
48098c3249
Replaced var/sizes_to_number with weirdass formula that is faster and takes up less space in code than list lookups
2014-06-24 11:37:03 -04:00
2786bcc54b
Override emp_act on the ionrifle
...
A gun isn't much use if it disables itself
fixes #3994
2014-06-24 20:37:27 +12:00
Firecage