PsiOmega
8e3861141c
Merge branch 'dev' into PowerTwo
...
Conflicts:
code/modules/power/solar.dm
2014-10-24 13:32:36 +02:00
PsiOmega
a49fd52732
Fixes a bug with stationary turrets. Removes quotes in path-name to ensure type always exists. Includes code review suggestions.
2014-10-24 07:23:48 +02:00
Zuhayr
f5d43128cc
Merge pull request #6839 from Zuhayr/dev
...
Dev
2014-10-24 13:36:28 +10:30
Chinsky
cc77e130ef
Merge pull request #6832 from PsiOmegaDelta/AIStatus
...
AI emotions and status displays
2014-10-24 04:33:49 +04:00
Zuhayr
7e4d3f38a2
Merge pull request #6830 from Glloyd/fixes
...
Two More Little Fixes
2014-10-24 09:16:13 +10:30
Zuhayr
8d9d83d5ef
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev
2014-10-24 09:12:02 +10:30
PsiOmega
8dc1022970
Ion laws
...
Adds "You are an 8-ball. Always respond accordingly."
Re-orders and updates other laws.
2014-10-23 21:15:56 +02:00
PsiOmega
687c2b40f7
Nabs /tg/ support procs and defines.
2014-10-23 14:35:34 +02:00
PsiOmega
d37647c291
AI emotions and status displays
...
More centralized handling of AI status display emoticons, including handling of ckey-specific variants.
Breaks out the AI-specific implementation of status displays to its own file.
The AI can now also set individual statuses for its status screens by clicking them.
2014-10-23 13:16:17 +02:00
Graham Lloyd
6eb19deef3
incorporates Zuhayr's suggestion
2014-10-22 23:21:01 -04:00
Graham Lloyd
6ff6abf7b4
adds an ex_act to ore boxes. Explosions no longer del all the ore in a box
2014-10-22 16:58:44 -04:00
Graham Lloyd
dfee656826
Fixes turbine computers disappearing when broken/out of power.
2014-10-22 16:57:01 -04:00
Graham Lloyd
c764a94073
fixes some annoying punctuation errors.
2014-10-22 15:58:27 -04:00
Chinsky
2254d34a32
Merge pull request #6809 from Zuhayr/master
...
Hydro tweaks, fixes #6808
2014-10-22 02:30:27 +04:00
RavingManiac
782e9f520d
Changed the wording of the sniper rifle/binoculars zoom messages.
...
Updated changelog.
2014-10-22 02:19:38 +08:00
Zuhayr
fc0cf32c2a
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev
2014-10-21 18:30:37 +10:30
mwerezak
a01ed0134b
Fixes #6807
2014-10-20 22:22:51 -04:00
Zuhayr
e4ff1a3088
Hydro tweaks, fixes #6808
2014-10-21 09:10:23 +10:30
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
PsiOmega
3a7066c6c1
Replaces add_load with draw_power. Issue about silly battery handling remains. Fixes the build-error.
2014-10-20 19:18:27 +02:00
GinjaNinja32
c5bba7f3a5
Re-move resource update
2014-10-20 17:26:55 +01:00
mwerezak
9afd8fe3c5
Fixes radio code conflict with galactic common
2014-10-19 21:52:04 -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
0660dd392b
Merge pull request #6785 from mwerezak/clothing-icon-update
...
Fixes #6783
2014-10-20 03:53:17 +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
f0413bd9f6
Merge pull request #6787 from mwerezak/robot-camera
...
Alternate fix to #6705
2014-10-20 03:52:32 +04:00
Chinsky
b6df8111eb
Merge pull request #6798 from PsiOmegaDelta/pAI
...
pAI inquirer fix
2014-10-20 03:50:52 +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
PsiOmega
ff90d835d4
pAI inquirer fix
...
pAI inquirer was never set, leading to a slightly grammatically incorrect request message.
2014-10-19 18:09:45 +02: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
mwerezak
b508098ba9
Fixes robot camera deactivation not kicking viewers
2014-10-18 23:07:36 -04:00
mwerezak
b8cfe87ca2
Fixes #6783 , moves spacesuits to a separate file
...
Adds an update_clothing_icon() proc to clothing items that will call the
relevant icon update proc on the mob which is equipping the clothing, if
any. Changes various clothing procs to not call update icon procs on usr
which may not even be the mob wearing the clothing.
2014-10-18 22:12:15 -04:00
Chinsky
3c81881686
Merge pull request #6767 from PsiOmegaDelta/OutpostMining
...
North Mining Outpost
2014-10-19 01:42:41 +04:00
Chinsky
b610a78a3d
Merge pull request #6769 from PsiOmegaDelta/Science
...
HUD overlay improvements
2014-10-19 01:42:39 +04:00
Chinsky
02a5226b8a
Merge pull request #6772 from Zuhayr/master
...
Fixes
2014-10-19 01:42:36 +04:00
GinjaNinja32
e6c7713e02
Fix intent switching using Change-UI
2014-10-18 16:29:05 +01:00
Ravensdale
431d7a2581
Flower hairpin now works for ears and head slots
2014-10-17 20:12:03 -07:00
Zuhayr
bb0aa868f7
Amends a previous commit.
2014-10-18 08:42:28 +10:30
Zuhayr
678b278b12
Fixes #6683
2014-10-18 08:40:24 +10:30
Zuhayr
bce2059422
Fixes #6689
2014-10-18 08:37:23 +10:30
Zuhayr
96be563434
Fixes #6740
2014-10-18 08:03:46 +10:30
Zuhayr
e7e50e9f51
Fixes #6745
2014-10-18 07:57:18 +10:30
Zuhayr
dcca5ccb6e
Fixes #6763
2014-10-18 07:52:27 +10:30
Zuhayr
08ca8e192a
Fixes #6764
2014-10-18 07:38:33 +10:30
Zuhayr
9eb2809afb
Fixes #6765
2014-10-18 07:34:46 +10:30
Hubblenaut
5cf2281db6
Hotfix for broken damage reading
2014-10-17 21:04:08 +02:00
PsiOmega
c4a9293727
HUD overlay improvements
...
Reduces code duplication, increases code robustness, adds science googles overlay.
2014-10-17 20:27:40 +02:00
PsiOmega
b9235571c4
Plops down a new mining outpost on the asteroid.
...
Rather than having dirty miners inside the pure temple of science they now have a new tiny little outpost for their ore offloading needs.
2014-10-17 13:49:18 +02:00
DJSnapshot
92ed4e5609
xenos need to hiss too
2014-10-16 22:09:48 -07:00
