PsiOmega
52e6f96dc7
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2014-12-09 17:55:14 +01:00
Ccomp5950
cab064cd16
Merge pull request #7340 from Zuhayr/dev-freeze
...
Dev-freeze fixes.
2014-12-09 11:48:33 -05:00
Zuhayr
fea8868753
Fixes #7310 and should also fix #7311
2014-12-10 02:28:03 +10:30
PsiOmegaDelta
63a5d009c7
Merge pull request #7267 from GinjaNinja32/noise
...
Audible emote improvement, adds ability to emote over radio.
2014-12-09 11:54:57 +01:00
Zuhayr
ff2c23714f
Bunch of diona nymph tweaks/fixes.
2014-12-09 20:52:41 +10:30
Loganbacca
2b98f70f9f
Science goggles overlay fix
2014-12-09 22:05:14 +13:00
Ccomp5950
4d615fc294
Merge pull request #7271 from Segrain/dev-freeze
...
Dev-freeze fixes.
2014-12-08 20:40:02 -05:00
GinjaNinja32
681a6d21ea
Merge remote-tracking branch 'upstream/dev' into !
...
Conflicts:
code/modules/mob/hear_say.dm
2014-12-08 15:32:49 +00:00
Zuhayr
3c66bd3920
Merge resolution.
2014-12-08 13:01:04 +10:30
Segrain
e0ab31756d
Fix for double definition.
2014-12-08 04:01:00 +03:00
Segrain
aa575b446a
Fix for #7260 .
2014-12-08 03:57:02 +03:00
GinjaNinja32
b6de85ec56
Fixes, better handling of things
2014-12-07 17:01:19 +00:00
Zuhayr
1176510fb2
Amendments to previous commit.
2014-12-08 03:29:03 +10:30
GinjaNinja32
17597af7fc
Better handling of language list, mobs no longer require noise-language in their list
2014-12-07 12:09:29 +00:00
GinjaNinja32
6a975a1e6a
Noise emotes
...
Conflicts:
code/modules/mob/living/carbon/brain/say.dm
2014-12-07 12:09:02 +00:00
Zuhayr
e4a332c5b6
Fixes #7262
2014-12-07 21:20:24 +10:30
Zuhayr
a7ce13f49d
Fixes #7223 and #6966 , adds inhand and suit sprites for nymphs.
2014-12-07 20:44:11 +10:30
Zuhayr
958eb62ed5
Refactors a lot of reused/redundant death code, fixes #7224
2014-12-07 17:18:56 +10:30
Chinsky
60fcda13e7
Merge pull request #7241 from GinjaNinja32/slimefix
...
Fixes invisible slimes.
2014-12-06 04:23:43 +03:00
Chinsky
91cbd95838
Merge pull request #7237 from PsiOmegaDelta/PunchTheKeysForGodsSake
...
Fixes #7233 .
2014-12-06 04:23:31 +03:00
Chinsky
92a88b8a23
Merge pull request #7243 from mwerezak/h2h
...
Unarmed attacks
2014-12-06 04:23:23 +03:00
mwerezak
032308fb9d
Fixes #7213 restoring unarmed damage to previous values, adjusts unarmed attack logs.
...
Unarmed attack messages no longer assume every attack verb ends with -ed.
2014-12-05 18:10:39 -05:00
GinjaNinja32
e8eb73a3c4
Fixes invisible slimes
2014-12-05 20:50:33 +00:00
PsiOmega
4a0536bca7
Fixes #7233 .
...
Making sure the skills list is always initiated, even when not created as a player mob.
2014-12-05 11:55:16 +01:00
PsiOmega
1f9cb08102
Syndicate borg code refactoring.
...
Refactors the borg syndicate code to be more accessible to adminbus.
Syndicate borgs have a jetpack module.
Overrides canUseTopic() to limit what the Syndi-borg can interact.
Still has all access, may be more limited in the future if Bump() is refactored /tg/ style. Admins: Spawn with care.
2014-12-04 12:56:29 +01:00
Ccomp5950
f1c77dcb16
Merge pull request #7190 from PsiOmegaDelta/Topic
...
Fixes exploit that lets AIs use machinery even after cameras are disabled.
2014-12-02 20:29:47 -05:00
PsiOmegaDelta
4582c0038b
Merge pull request #7205 from Mloc/bs12-setdir
...
refactor 'dir = ' into 'set_dir()'
2014-12-02 14:38:31 +01:00
PsiOmegaDelta
b05c966b64
Merge pull request #7198 from atlantiscze/interactions
...
(mostly) silicon adjustments/features
2014-12-02 07:20:58 +01:00
Zuhayr
17f32c3ab3
Replacing a loop with the older code.
2014-12-02 02:58:26 +10:30
Mloc-Argent
117ca6a135
refactor 'dir = ' into 'set_dir()'
...
This should have little/no gameplay effect right now, just paving the
way for directional lights.
Replaced handle_rotation() on buckly things with this.
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-12-01 13:44:02 +00:00
Zuhayr
8240f14176
Fixes #7185 , works on #7184
2014-12-01 23:55:03 +10:30
PsiOmegaDelta
a1a66870ca
Merge pull request #7203 from Zuhayr/unarmed
...
Refactoring the context-based combat PR v2
2014-12-01 11:17:14 +01:00
Zuhayr
487117a0ae
Reverting a now unneeded var change.
2014-12-01 20:42:32 +10:30
Zuhayr
bee0b9d23d
Tweaks after testing.
2014-12-01 20:20:30 +10:30
Zuhayr
d65ead4f7e
Changed \red to span in unarmed_attack.dm.
2014-12-01 20:10:27 +10:30
Zuhayr
0ae473b6ea
Removed antag role buffs.
2014-12-01 20:06:43 +10:30
Zuhayr
855f75bd3c
Removed magboot stomp.
2014-12-01 20:03:08 +10:30
PsiOmegaDelta
e18d5f51f9
Merge pull request #7172 from Neerti/11_29_14_minor_borg_drone_changes
...
Minor changes to drone borg sprite.
2014-12-01 06:46:46 +01:00
Zuhayr
016a9d8ba2
Merge branch 'unarmed' of https://github.com/Zuhayr/Baystation12 into unarmed
2014-12-01 15:33:07 +10:30
PsiOmegaDelta
e5c5209f7a
Merge pull request #7183 from Zuhayr/dev
...
Hardsuit fixes.
2014-12-01 05:58:24 +01:00
Atlantiscze
64f9a502f9
Mining robot module upgrade
...
- Mining cyborgs can now properly work with drills.
- Mining cyborgs have received ore scanner, crowbar, and limited version of magnetic gripper.
- Mining cyborgs can now swap power cells inside mining drills, as well as upgrade them if provided better parts.
- As a bonus, cyborgs can now see how much ore is in ore boxes (because it makes sense that cyborg which mined ton of ore can check how much ore it mined)
2014-12-01 05:11:35 +01:00
Atlantiscze
166288293b
Cyborg Atmospherics Tools!
...
- Matter Decompiler now clears unused pipe assemblies. Long gone are the times where cyborgs couldn't remove old pipe parts.
- Engineering and Construction cyborgs now have pipe painter tool, which allows them to paint pipes properly.
2014-12-01 03:39:36 +01:00
Atlantiscze
afadcdc35a
Increases AI power usage
...
This commit increases AI power usage to 50kW. This was discussed on codershuttle and should (/w some minor lags) give the AI approximatey 60 minutes of power with fully charged SMES.
2014-12-01 02:06:03 +01:00
Atlantiscze
e2196fe6ec
Robotic Cable Coils
...
- Cyborgs and Drones can now use change-colour verb to change colour of their integrated cable coil.
2014-12-01 02:02:11 +01:00
Zuhayr
0903bd7fc5
Working on some suit bugs, attempted to fix the welding overlay issue with no success.
2014-12-01 01:51:52 +10:30
PsiOmega
8857365c1c
Fixes exploit that lets AIs use machinery even after cameras are disabled.
2014-11-30 15:24:39 +01:00
Zuhayr
14cf4aa8e3
Refactored mag grippers a bit. Kinda hate myself for writing them the way I did, but hindsight etc
2014-12-01 00:37:13 +10:30
Chinsky
dbf69cba81
Merge pull request #7154 from PsiOmegaDelta/SneakyPersonalAIs
...
pAIs can now hide.
2014-11-30 12:50:44 +03:00
PsiOmega
5e34d12877
Merge remote-tracking branch 'upstream/dev' into RoboCircuit
...
Conflicts:
code/modules/mob/living/carbon/brain/posibrain.dm
maps/exodus-1.dmm
2014-11-30 10:47:36 +01:00
Chinsky
99cf1ee8f5
Merge pull request #7166 from PsiOmegaDelta/TurfClick
...
Fixes AIs seeing runes in the Alt+Click panel
2014-11-30 00:56:25 +03:00
