Segrain
6e3afeac5f
Bugfix.
2014-11-25 10:29:39 +03:00
PsiOmegaDelta
d98bf2f84d
Merge pull request #7121 from GinjaNinja32/monkey
...
Fix for runtiming neaera cubes
2014-11-25 06:44:11 +01:00
PsiOmegaDelta
1c10dc6a05
Merge pull request #7120 from mwerezak/init
...
Cleans up monkey initialization
2014-11-25 06:37:26 +01:00
GinjaNinja32
a543d557b9
Fix sub-1 thaler piles being invisible, disallow subdivision below 0.01
2014-11-24 18:56:41 +00:00
GinjaNinja32
20779aac33
Fix ultra-rich people crashing the server
2014-11-24 18:11:09 +00:00
PsiOmegaDelta
75993f2ef5
Merge pull request #7123 from DJSnapshot/adminfeatures
...
fixes adminhelp to support mods as well
2014-11-24 18:33:16 +01:00
GinjaNinja32
48343a23fb
Fix most nullspace items, rewrite floor tiles not to del() on every place/remove
2014-11-24 17:05:46 +00:00
PsiOmega
bf24d288ea
Particle acceleration wiring.
2014-11-24 10:12:57 +01:00
Zuhayr
4722c9a864
WIP on refactoring the context-based combat PR
2014-11-24 12:05:18 +10:30
mwerezak
7174cca74a
Updates whispering messages
...
Certain languages can specify a certain verb for whispering and the
message seen when someone whispers outside of hearing range now hints at
the language.
2014-11-23 19:46:10 -05:00
DJSnapshot
b6463cf772
fixes adminhelp to support mods as well.
2014-11-23 16:17:26 -08:00
Zuhayr
a63ec86871
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev
2014-11-24 08:58:30 +10:30
GinjaNinja32
fbce3cba4b
Fix neaera cubes, change monkeycube eat varfind method to not create nullspace monkeys
2014-11-23 18:57:42 +00:00
mwerezak
feaa27fff1
Cleans up monkey initialization
2014-11-23 13:44:59 -05:00
PsiOmegaDelta
7dd5da6793
Merge pull request #6896 from Hubblenaut/dev
...
Context-based Combat Part 1
2014-11-23 19:13:52 +01:00
PsiOmegaDelta
c8e00f3e20
Merge pull request #7089 from sabiram/dev
...
Moves my (sabirm)'s custom item to common loadout pool
2014-11-23 18:08:16 +01:00
PsiOmegaDelta
8e50a32ba8
Merge pull request #7103 from Segrain/dev
...
Robotic appearances.
2014-11-23 12:05:51 +01:00
PsiOmegaDelta
46a1a7c320
Merge pull request #7101 from MagmaRam/sprites
...
Adds inhand sprites for the captain's tunic and jacket
2014-11-23 12:05:45 +01:00
Zuhayr
f722d570fa
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev
2014-11-23 12:52:55 +10:30
Zuhayr
66c6c0f270
Amendment to the previous.
2014-11-23 10:15:31 +10:30
Zuhayr
5568ed15c1
Randomizes strange seed icons, fixes poppies.
2014-11-23 10:15:15 +10:30
PsiOmegaDelta
6db8680406
Merge pull request #7097 from GinjaNinja32/sensors
...
Crew Monitoring Computer improvements, wallets working with computers
2014-11-22 22:36:40 +01:00
PsiOmega
de5c059a01
AI disposal interaction.
...
The AI can now interact with disposal units and turn the pump on/off.
2014-11-22 11:46:51 +01:00
Ccomp5950
674a76645f
Merge pull request #7082 from PsiOmegaDelta/Science!
...
Further Research Isolation Cell Changes
2014-11-22 05:39:52 -05:00
PsiOmega
f3173bbbcf
Merge remote-tracking branch 'upstream/dev' into Science!
2014-11-22 11:37:17 +01:00
PsiOmega
1784e62621
Merge remote-tracking branch 'upstream/dev' into Stripping
...
Conflicts:
code/modules/mob/living/carbon/human/whisper.dm
2014-11-22 11:27:19 +01:00
PsiOmegaDelta
d9aae79a32
Merge pull request #7008 from Zuhayr/spaceninjas
...
Hardsuit/voidsuit change, ninja refactor.
2014-11-22 09:30:54 +01:00
Ccomp5950
d0383883c2
Merge pull request #7094 from Neerti/borg_hud_port_2
...
Semi-ports /tg/'s cyborg HUD, now with less merge conflict!
2014-11-22 03:27:10 -05:00
Ccomp5950
93ac9115a5
Merge pull request #7093 from PsiOmegaDelta/Tracking
...
AI can now track people with max level sensors.
2014-11-22 03:25:59 -05:00
Ccomp5950
2b7170a6aa
Merge pull request #7091 from mwerezak/gun-intents
...
Adds intent-based firing control to guns, fixes targeting bug
2014-11-22 03:25:12 -05:00
Ccomp5950
3ca02037ef
Merge pull request #7088 from mwerezak/skrell
...
Implements skrell changes for Searif
2014-11-22 03:23:41 -05:00
Ccomp5950
efcf9a9d34
Merge pull request #7087 from mwerezak/master
...
Fixes #7086
2014-11-22 03:13:49 -05:00
Zuhayr
1c35f8825b
Dummied out the AI movement code for a later project.
2014-11-22 08:04:06 +10:30
Zuhayr
05922375c5
Added the remaining missing icons (shitty codersprites, pls fix spriters)
2014-11-22 07:57:34 +10:30
Zuhayr
c8e8e663f9
Merge resolution.
2014-11-22 07:31:44 +10:30
PsiOmega
7182ff9c3f
/tg/ input stripping.
...
Borrows /tg/ html stripping code.
Ghosts are the first to be given this boon, they now have to deliberately emote things like "Spooky man and it#36&;s friends type crap".
2014-11-21 18:32:51 +01:00
Segrain
078d6f74a5
Robotic flavour texts.
2014-11-21 19:32:40 +03:00
Segrain
7f199874fb
Examining robomodules.
2014-11-21 19:28:46 +03:00
MagmaRam
ee4ea4977c
Adds inhand sprites for the captain's tunic and jacket
2014-11-21 08:14:57 -05:00
GinjaNinja32
116705b61b
Fixes wallets, makes CMC use alt-titles, actually remove dead block
2014-11-21 10:42:52 +00:00
PsiOmega
2a796f2ddd
Merge remote-tracking branch 'upstream/master' into dev
2014-11-21 10:27:56 +01:00
Neerti
0379acad97
Fixes a runtime I made by improper conflict resolution.
2014-11-21 03:47:38 -05:00
Neerti
72c9b2eb15
Resolves conflicts, cherrypicks my code.
2014-11-21 03:32:00 -05:00
PsiOmega
84b36f6208
AI can now track people with max level sensors.
...
Crew members with tracking sensors enabled can now be tracked without the need of camera coverage.
2014-11-21 08:33:20 +01:00
PsiOmegaDelta
350273dea4
Merge pull request #7071 from Segrain/dev
...
Equipping custom loadout.
2014-11-21 08:03:24 +01:00
PsiOmegaDelta
34e0019dad
Merge pull request #7085 from Hubblenaut/hud
...
MedicalHUD takes hardcrit in account
2014-11-21 08:02:31 +01:00
PsiOmegaDelta
921815df04
Merge pull request #6906 from mwerezak/faxmachine
...
Fax Machines
2014-11-21 08:02:21 +01:00
PsiOmegaDelta
e3ef3b7347
Merge pull request #7081 from MagmaRam/bugfix
...
Fixes paper bundles not burning properly with a match
2014-11-21 08:02:13 +01:00
mwerezak
aaba7e5c74
Adds intent-based firing control to guns
2014-11-20 23:10:47 -05:00
sabiram
bdf4905289
I am dumb
...
It is what it is.
2014-11-20 17:08:24 -05:00
