PsiOmega
|
e2a7710491
|
The AI now has a radio channel for its private frequency.
|
2014-10-26 22:44:19 +01:00 |
|
Chinsky
|
3839644bd8
|
Merge pull request #6651 from PsiOmegaDelta/PowerTwo
Ports /tg/'s cable and powernet code
|
2014-10-26 23:54:31 +03:00 |
|
Chinsky
|
44a01be13f
|
Merge pull request #6856 from Baystation12/dev-freeze
Freeze - Dev
|
2014-10-26 09:41:07 +03:00 |
|
PsiOmega
|
8e3861141c
|
Merge branch 'dev' into PowerTwo
Conflicts:
code/modules/power/solar.dm
|
2014-10-24 13:32:36 +02:00 |
|
Zuhayr
|
f5d43128cc
|
Merge pull request #6839 from Zuhayr/dev
Dev
|
2014-10-24 13:36:28 +10:30 |
|
Zuhayr
|
a5e11e208f
|
Merge pull request #6823 from mwerezak/hoverpod
Fixes #6820, #6822, adds ion trails to hoverpods.
|
2014-10-24 09:16:44 +10:30 |
|
Zuhayr
|
8d9d83d5ef
|
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev
|
2014-10-24 09:12:02 +10:30 |
|
Chinsky
|
5633ed8c5a
|
Merge pull request #6827 from Glloyd/pass
Fixes effect/effect and Children Not Passing Over Tables/Through Grilles
|
2014-10-23 05:35:40 +04:00 |
|
Graham Lloyd
|
1401877e01
|
silly me
|
2014-10-22 17:11:11 -04:00 |
|
PsiOmega
|
acd210cdc5
|
Mirror Science
Future science to explain magic hair-corrective abilities.
|
2014-10-22 22:53:50 +02:00 |
|
Graham Lloyd
|
c764a94073
|
fixes some annoying punctuation errors.
|
2014-10-22 15:58:27 -04:00 |
|
Graham Lloyd
|
5f1f3529f0
|
Fixes extinguisher blasts (and effect/effects in general, like smoke) not being able to pass over tables and through grilles.
|
2014-10-22 15:44:40 -04:00 |
|
mwerezak
|
604ad08f07
|
Fixes #6820
Readds missing check, makes hoverpods their own mech type and moves them
to another folder.
|
2014-10-22 00:15:42 -04:00 |
|
Zuhayr
|
bd840fc8ec
|
Merge pull request #6817 from RavingManiac/master
Changed the wording of the sniper rifle/binoculars zoom messages.
|
2014-10-22 08:46:13 +10:30 |
|
RavingManiac
|
3e61102908
|
another minor change to the sniper rifle zoom message
|
2014-10-22 02:28:23 +08:00 |
|
RavingManiac
|
782e9f520d
|
Changed the wording of the sniper rifle/binoculars zoom messages.
Updated changelog.
|
2014-10-22 02:19:38 +08:00 |
|
GinjaNinja32
|
5b7cb1f117
|
Fix AI PDA showing tap messages
|
2014-10-21 16:46:48 +01:00 |
|
Zuhayr
|
fc0cf32c2a
|
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev
|
2014-10-21 18:30:37 +10:30 |
|
GinjaNinja32
|
c585a97162
|
Let's actually use these barsign sprites.
|
2014-10-20 23:58:26 +01:00 |
|
Chinsky
|
bad385e1d1
|
Merge pull request #6791 from Zuhayr/dev
Removes references to the Syndicate and renames nuclear emergency mode.
|
2014-10-21 01:13:17 +04:00 |
|
Chinsky
|
3796c034f3
|
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into master-dev
Conflicts:
icons/mob/head.dmi
icons/obj/clothing/hats.dmi
maps/tgstation2.dmm
|
2014-10-20 04:52:45 +04:00 |
|
Chinsky
|
61e50ab72a
|
Merge pull request #6790 from mwerezak/robot-radio
Fixes robot radio component not using power
|
2014-10-20 03:53:10 +04:00 |
|
Chinsky
|
f1f730894c
|
Merge pull request #6789 from mwerezak/binary-talk
Allows properly keyed radios to broadcast in robot talk and/or hivemind + some cleanup
|
2014-10-20 03:50:12 +04:00 |
|
Zuhayr
|
99ff852e46
|
Removes references to the Syndicate and renames nuclear emergency mode.
|
2014-10-19 16:05:40 +10:30 |
|
mwerezak
|
9424d892ba
|
Fixes robot radio component not using power
Also shifts power usage so binary talk uses less power while radio uses
more.
|
2014-10-19 00:50:13 -04:00 |
|
Zuhayr
|
abc00094ca
|
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev
|
2014-10-17 06:18:49 +10:30 |
|
Zuhayr
|
b09591618d
|
Merge pull request #6738 from PsiOmegaDelta/Messaging
Less PDA confusion.
|
2014-10-17 06:16:30 +10:30 |
|
PsiOmega
|
4507be1430
|
Fixes #6735
Moves the open/closing sounds up the class hierarchy, from the statis bag to the body bag.
|
2014-10-16 10:03:48 +02:00 |
|
PsiOmega
|
cd940cbf4b
|
Less PDA confusion.
When writing PDA messages the input window title is now that of the receiver's PDA name instead of the sender's.
|
2014-10-16 09:58:59 +02:00 |
|
Mloc-Argent
|
4871a3a850
|
Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
code/ATMOSPHERICS/pipes.dm
icons/atmos/pipes.dmi
|
2014-10-15 22:13:44 +01:00 |
|
PsiOmega
|
68f4f1809e
|
AI PDA tapping fix
An AI should no longer tap on a non-existing screen with its non-existing fingers while writing PDA messages.
|
2014-10-15 17:38:54 +02:00 |
|
Menshin
|
70b2c9a1fa
|
Who thought it was a good idea to omit multiplier for 1x ?!?
|
2014-10-14 22:48:48 +02:00 |
|
Menshin
|
6387c96bb5
|
Ambiguous expression readded.
|
2014-10-14 22:31:19 +02:00 |
|
Menshin
|
eb707ea9b6
|
Prevent stacks multiplier href exploit
|
2014-10-14 18:34:53 +02:00 |
|
PsiOmega
|
a1ee4e766b
|
Basically ripped over /tg/'s powernet and cable code into our own codebase.
Keeps Z-level code as it was.
Modifies/restores powernet procs as necessary to match our own implementation changes.
|
2014-10-13 17:13:04 +02:00 |
|
Zuhayr
|
4c070bad02
|
Bunch of xeno fixes, details in PR.
|
2014-10-13 17:32:13 +10:30 |
|
Zuhayr
|
cd2b5e761d
|
Fixes being unable to knock on windows.
|
2014-10-13 11:21:37 +10:30 |
|
Zuhayr
|
9b23315359
|
Fixes #6644
|
2014-10-11 07:44:48 +10:30 |
|
Zuhayr
|
37cb78eefa
|
Fixes #6613 and #6492
|
2014-10-08 23:10:12 +10:30 |
|
Zuhayr
|
df038c9fe8
|
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev
|
2014-10-06 20:15:59 +10:30 |
|
Zuhayr
|
d0b3a3a39b
|
Merge pull request #6601 from Mloc/bs12-calert
donut boxes now update their icon to properly reflect their contents
|
2014-10-06 19:37:24 +10:30 |
|
Mloc
|
9faec14707
|
donut boxes now update their icon to properly reflect their contents
Signed-off-by: Mloc <colmohici@gmail.com>
|
2014-10-05 19:24:30 +01:00 |
|
Chinsky
|
41ce4fc57d
|
Merge pull request #6588 from RavingManiac/dev
Sniper scope improvements, binoculars
|
2014-10-05 03:37:33 +04:00 |
|
RavingManiac
|
756e9ae030
|
Zooming with an item is now done with a general proc zoom(). This applies to binoculars and sniper rifle.
|
2014-10-04 17:38:38 +08:00 |
|
RavingManiac
|
2aab019cba
|
Binoculars zoom no longer a right-click menu option. Already supplanted by attack_self().
|
2014-10-04 04:05:26 +08:00 |
|
Gamerofthegame
|
a47ec82103
|
Merge repair
|
2014-10-03 16:04:31 -04:00 |
|
RavingManiac
|
f0da0380a5
|
Sniper rifle zoom now adds a client.pixel_x/y offset in addition to zoom. Currently 11 tiles in the direction the user is facing. Zooming can now be done through the right-click menu.
Binoculars added. Functionally similar to sniper scope. Adminspawn-only as of this commit.
|
2014-10-04 04:01:56 +08:00 |
|
Zuhayr
|
e283fa850f
|
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
|
2014-10-03 06:58:53 +09:30 |
|
PsiOmega
|
fd060cc5fe
|
Fixes #6546
Replaces iffy cartridge type checks with access checks.
|
2014-10-02 09:29:04 +02:00 |
|
mwerezak
|
3209f19304
|
Removes unused radio code, world print in forcesay
|
2014-10-01 21:49:24 -04:00 |
|