Commit Graph

17645 Commits

Author SHA1 Message Date
Zuhayr
961272817f Merge pull request #8461 from comma/biofluff
Added support for multiple cloning vats per single console.
2015-03-18 02:55:05 +10:30
Zuhayr
ffcfa9aff2 Merge pull request #8515 from PsiOmegaDelta/MagicalLawZero
Law Zero phrasing is now a config option.
2015-03-18 02:52:12 +10:30
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
PsiOmega
744ef41d8e Law Zero phrasing is now a config option.
The default value is a non-objective phrasing. config.txt contains the default phrasing should it be desired.
2015-03-17 14:47:32 +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
Zuhayr
0191420236 Merge pull request #8510 from PsiOmegaDelta/DoMob
do_after/do_mob code cleanup.
2015-03-17 19:03:35 +10:30
PsiOmega
d3fac52e11 do_after/do_mob code cleanup.
Cleans up the code a bit and makes do_mob() make regular checks, similar to do_after().
2015-03-17 08:13:34 +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
PsiOmegaDelta
d6bff0a50b Merge pull request #8502 from Techhead0/dev
Botany tool construction and clippers
2015-03-17 07:46:03 +01: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
Techhead0
073f0f1c4a Adds Tactical Knife
Found under Arms & Ammo for hacked autolathes.
2015-03-16 09:38:36 -04: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
Techhead0
2ca80a06b9 Botany tool construction and clippers
Adds hatchets and mini hoes to the autolathe recipe list. Material costs
are unchanged. Also adds plant clippers (reskinned wirecutters) to
secure hydroponics lockers.
2015-03-15 19:15:35 -04: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
Zuhayr
7276efc48e Merge pull request #8480 from AstatorDem/processingTheProcess
Added a check to process() to recognize machines that use auto_use_power
2015-03-15 12:15:50 +10:30
Zuhayr
c0185546e0 Merge pull request #8459 from comma/cryosprite
Cryo will now show occupant inside on sprite.
2015-03-15 12:15:27 +10:30
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
Daniel García Baldomir
2e571e5448 Pass at removing empty process() on game/machinery 2015-03-14 21:38:23 +01:00
Daniel García Baldomir
a50bebcbae Added check for use_power in machinery.dm process 2015-03-14 21:07:55 +01:00
Techhead0
020e1e4c60 Tweaks.
Regeneralizes sunglasses. Adds plant analyzer and megaphone. Puts EMT gear under general medical.
2015-03-14 15:52:29 -04:00
Daniel García Baldomir
1c67f811a7 Updated power usage of the Autholathe. 2015-03-14 20:46:41 +01:00
Daniel García Baldomir
9e464d823f Added process to robo-fabs and teleporter. 2015-03-14 20:06:52 +01:00
Techhead0
10c81f8d22 Forgot a comma. 2015-03-14 15:04:09 -04:00
Daniel García Baldomir
78798e7548 Added process on machines A to J. Changed some world iterations to machines iterations. 2015-03-14 19:45:34 +01: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
Daniel García Baldomir
8e5751a632 Bodyscanner : idle 60, active 10k 2015-03-14 19:27:36 +01: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
Zuhayr
471ba3325e Merge pull request #8463 from comma/sstone
Soulshard / Shade changes
2015-03-14 01:29:52 +10:30
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