PsiOmegaDelta
48dce2d1fe
Merge pull request #8507 from Techhead0/firepat2
...
Can pat burning mobs to put them out.
2015-03-17 16:35:14 +01:00
Zuhayr
ce062881ae
Merge pull request #8511 from PsiOmegaDelta/TrackMob
...
AIs can now use the crew monitor console for tracking.
2015-03-17 23:08:44 +10:30
Chinsky
d2518798ec
Merge pull request #8486 from PsiOmegaDelta/NanoLaws
...
NanoUI - Silicon law manager
2015-03-17 14:24:30 +03:00
Techhead0
7de83ec6b0
Can pat burning mobs to put them out.
...
Click on them with help intent to do so. This has a mild chance of
lighting you on fire yourself. If you're already doused in fuel, this is
guaranteed. Also, burning people can set others on fire by hugging them.
Now with improved if(do_mob)
2015-03-17 07:13:48 -04:00
PsiOmega
934de7eb37
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-03-17 12:03:34 +01:00
PsiOmega
018bd4ebdd
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-03-17 12:01:09 +01:00
PsiOmega
9d2ba41a3a
Ghosts with antagHUD enabled can now see AI/borg laws on examine.
2015-03-17 11:39:22 +01:00
PsiOmega
f2d3f7833b
AIs can now use the crew monitor console for tracking.
...
Due to balance concerns, the headache of handling fake identities, meta, etc., this only works for crew members with tracking sensors enabled.
2015-03-17 10:11:18 +01:00
Chinsky
158a2731e3
Merge pull request #8335 from GinjaNinja32/reagent_dispenser
...
Reagent dispenser rework
2015-03-17 10:05:18 +03:00
Chinsky
376657bdd7
Merge pull request #8353 from Glloyd/goonschedu
...
Goon Process Scheduler for BS12
2015-03-17 10:04:21 +03:00
PsiOmega
7f68403ae4
NanoUI - Silicon law manager
...
NanoUI interface for viewing silicon laws, accessible to both the silicon and admins.
Malf AIs and admins may also add, edit, and remove laws.
2015-03-17 07:22:02 +01:00
GinjaNinja32
2f4a4a6a6c
Remove medicine crate and medicine cartridge crates
2015-03-16 21:24:30 +00:00
GinjaNinja32
458970a617
Merge remote-tracking branch 'upstream/dev' into reagent_dispenser
2015-03-16 21:21:56 +00:00
PsiOmega
cfb3bad3e2
Fixes #8498 .
...
Simple animals should now die properly when killed.
2015-03-16 13:46:08 +01:00
PsiOmega
a1cbc80ed3
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-03-16 12:39:32 +01:00
PsiOmega
172110b582
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-03-16 12:37:43 +01:00
Den
a41434331f
Add middle mouse button action for buildmode
...
Middle Mouse Button on buildmode button= On/Off object type saying"
Middle Mouse Button on turf/obj = Capture object type"
2015-03-15 22:22:25 +02:00
Chinsky
1ead71a993
Merge pull request #8479 from Techhead0/dev
...
More things in belts.
2015-03-15 04:50:03 +03:00
PsiOmegaDelta
e61494561d
Merge pull request #8460 from comma/master
...
Fixes organ bioprinter and the organs.
2015-03-15 02:43:47 +01:00
Graham Lloyd
207a04a428
fixes the issue brought up on the PR.
2015-03-14 19:14:31 -04:00
Techhead0
10c81f8d22
Forgot a comma.
2015-03-14 15:04:09 -04:00
Techhead0
d4e46182af
More things in belts.
...
I widened the selection of things you can put in various belts. Most
notably, emergency gear in medical belts and botany gear in tool belts.
2015-03-14 14:38:30 -04:00
PsiOmegaDelta
2925a296dc
Merge pull request #8470 from Neerti/3-13-2015_borg_hotkeys
...
Ports /tg/'s Cyborg Hotkeys
2015-03-14 19:04:36 +01:00
mwerezak
6c794a8608
Fixes damage multiplier mixup, bumped var not being reset
2015-03-14 02:56:05 -04:00
mwerezak
e6e0c87062
Aggressive grab auto hit only applies to close targets and melee attacks
2015-03-14 01:53:11 -04:00
mwerezak
c4e4c77320
Having a neck grab on someone causes them to be hit by projectiles first instead of you.
...
If however the bullet misses or passes through the person being grabbed then it continues on and may still hit the person doing the grabbing.
2015-03-14 01:30:09 -04:00
mwerezak
812ff9869d
Implements projectile point blank damage multipliers for targets being grabbed.
2015-03-14 00:41:55 -04:00
Neerti
dc4d149832
Ports /tg/'s borg hotkeys. They work similarly to the AI's hotkeys.
2015-03-13 21:41:23 -04:00
mwerezak
6a5dd6c89e
Aggressive grabs prevent missing with weapons
2015-03-13 21:30:18 -04:00
PsiOmega
14811d35e9
Fixes #8439 .
...
Appears to be the last of the major re-occuring runtimes. Good work team.
2015-03-13 23:27:35 +01:00
PsiOmega
190bff8b47
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-03-13 14:23:00 +01:00
PsiOmega
ac25b0a614
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-03-13 14:21:38 +01:00
PsiOmega
2efa9c78f0
Corrects pulling icon_states.
2015-03-13 11:02:18 +01:00
PsiOmega
fac4eb08e3
Alarm subsystem is now processed by the scheduler. Removes now dead code.
2015-03-13 10:36:47 +01:00
Chinsky
f03759a246
Fixes organ bioprinter and the organs. Now less debuggy and less buggy too.
2015-03-13 12:24:27 +03:00
PsiOmega
0cc60870f5
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-03-13 09:31:03 +01:00
PsiOmega
ce30b00287
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/setup.dm
icons/mob/items_righthand.dmi
maps/exodus-1.dmm
maps/exodus-5.dmm
2015-03-13 09:23:26 +01:00
Zuhayr
100ffe4966
Merge pull request #8451 from comma/master
...
Fixes #8438
2015-03-13 17:19:36 +10:30
Chinsky
64a94a5043
Fixes #8438
...
Removed spawn based on suggestion, doesn't seem to cause that graphical glitch it was against.
2015-03-12 17:00:53 +03:00
Zuhayr
b5419a1673
Merge pull request #8443 from Baystation12/master
...
Master into dev-freeze.
2015-03-11 19:37:19 +10:30
Chinsky
69a080e2d6
Merge pull request #8421 from Neerti/3_9_2015-examine-text-med
...
Examine Tab Text: (Some) Medical Stuff
2015-03-11 07:28:54 +03:00
PsiOmega
b00138aa42
Fixes #5787 .
...
The pull icon is now immediately displayed/hidden when one starts/stops pulling an objects.
Not stolen from https://github.com/tgstation/-tg-station/pull/8279 .
2015-03-10 18:01:27 +01:00
Neerti
e07f06d7f4
I shouldn't proofread when sleep deprived.
2015-03-10 10:55:14 -04:00
PsiOmega
533ccef0ab
Robot code clean up and fixes.
...
Fixes runtime when a borg is reset.
Fixes issue where /proc/select_active_ai_with_fewest_borgs() would not always return the intended AI.
Fixes issues with new borgs spamming the master AI with creation messages under some circumstances.
2015-03-10 13:37:20 +01:00
PsiOmegaDelta
ff11ae9d54
Merge pull request #8426 from mwerezak/misc
...
Penetrating bullets are now more likely to go through glass doors
2015-03-10 09:26:11 +01:00
PsiOmega
a86c16b3e3
Fixes hydroponics update_icon() runtime.
...
Rounding could cause plant maturation to have a value of 0.
2015-03-10 08:16:20 +01:00
mwerezak
65a34943cd
Penetrating bullets are now more likely to go through glass doors
2015-03-10 03:00:24 -04:00
PsiOmega
85641b46e5
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-03-10 07:58:25 +01:00
PsiOmegaDelta
56516d1ec5
Merge pull request #8419 from mwerezak/blazer
...
Adds custom item for Von2531
2015-03-10 07:11:18 +01:00
Chinsky
9c30024ca0
Merge pull request #8411 from volas/admin_stuff
...
Some admin stuff
2015-03-10 09:09:35 +03:00
