Zuhayr
8ccca9a020
Merge pull request #7379 from PsiOmegaDelta/Stalkerism
...
Fixes #7366 .
2014-12-12 14:10:55 +10:30
Zuhayr
1291fe9565
Merge pull request #7376 from PsiOmegaDelta/BeepBeep
...
Fixes #7374 .
2014-12-12 14:10:39 +10:30
Zuhayr
44b23fe1b5
Merge pull request #7370 from Hubblenaut/dev-freeze
...
Context-based Combat Fixes
2014-12-12 14:10:23 +10:30
PsiOmegaDelta
c66cc1ac5e
Merge pull request #7387 from mwerezak/alarms
...
Fixes #7354
2014-12-11 10:25:06 +01:00
PsiOmega
8c8480cb26
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/machinery/computer/crew.dm
2014-12-11 08:18:58 +01:00
PsiOmegaDelta
a906d45b3c
Merge pull request #7383 from Segrain/dev-freeze
...
Dev-freeze fixes.
2014-12-11 06:42:44 +01:00
mwerezak
6d3ab9ea46
Fixes #7354
2014-12-11 00:41:44 -05:00
Segrain
0fc7177894
Fix for ghost hearing.
2014-12-11 08:32:27 +03:00
Segrain
b1785edf33
Fix for #7365 .
2014-12-11 05:01:47 +03:00
Segrain
323cc56a89
Topic fix.
2014-12-11 05:01:06 +03:00
Segrain
2582ef02b8
Namefix.
2014-12-11 05:00:31 +03:00
Segrain
944800eee4
Fix for #7352 .
2014-12-11 04:53:24 +03:00
Segrain
9bd818e2a4
Fix for #7351 .
2014-12-11 04:52:35 +03:00
Hubblenaut
55355cc77d
Context-based Combat Fixes
2014-12-11 00:25:52 +01:00
PsiOmega
087cc1882c
Fixes #7366 .
...
Kills unecessary photo datum which wasn't even used correctly anymore.
Photos have a global id for ease of synth syncing.
Changes how law/photo syncing is handled when pulsing the appropriate borg wire.
Also ensures re-synced borgs are added/removed from the appropriate AIs.
2014-12-10 21:54:57 +01:00
PsiOmega
3a2aed265b
Fixes #7374 .
...
Now checks the correct ringer flag when receiving a PDA message.
2014-12-10 20:25:03 +01:00
PsiOmega
8e5bc3a589
Fixes #7356 .
...
Clam now uses the proper arg name when trying to create borers.
Fixes a minor issue in the event manager, where the wrong Topic arg was used.
2014-12-10 20:11:00 +01:00
Zuhayr
5730bcb885
Merged master/dev config.txt.
2014-12-10 16:35:39 +10:30
Zuhayr
dda27082ba
Merge pull request #7357 from mwerezak/infinity
...
Prevents infinite loop
2014-12-10 16:29:22 +10:30
ccomp5950
3414e48ceb
Adds "paranoid" option to remove more powerful debug options from R_DEBUG.
...
The purpose of this is to allow for testers on our test server without them having advance proc call which can do some fun stuff with python, etc.
Also removes debug controller so that testers can't just edit the configuration to remove debugparanoid
The default config is the status quo, you have to go out of your way and set this option in config to remove proccal from R_DEBUG
2014-12-09 21:25:07 -05:00
mwerezak
0a6d1f8c81
Prevents infinite loop if a camera takes a picture of an atom with null in either it's overlays or underlays.
2014-12-09 17:19:02 -05:00
Zuhayr
53627175ef
Merge pull request #7347 from Baystation12/master
...
Updating dev-freeze from master.
2014-12-10 03:21:56 +10:30
Ccomp5950
cab064cd16
Merge pull request #7340 from Zuhayr/dev-freeze
...
Dev-freeze fixes.
2014-12-09 11:48:33 -05:00
Zuhayr
90f5da4e83
Merge pull request #7333 from PsiOmegaDelta/RadioWiresAreNotForYou
...
Fixes #7323 .
2014-12-10 03:15:28 +10:30
PsiOmegaDelta
5842c17536
Merge pull request #7338 from Loganbacca/tapefix
...
Tape fixes
2014-12-09 17:44:23 +01:00
Zuhayr
61cb862690
Merge pull request #7300 from PsiOmegaDelta/RoundEnd
...
Fixes #7295 .
2014-12-10 03:11:38 +10:30
Zuhayr
4aa7c072ca
Merge pull request #7337 from Loganbacca/glassesfix
...
Science goggles overlay fix
2014-12-10 03:11:18 +10:30
Zuhayr
39f303c50e
Actually fixes hardsuit back icons.
2014-12-10 02:37:23 +10:30
Zuhayr
fea8868753
Fixes #7310 and should also fix #7311
2014-12-10 02:28:03 +10:30
Zuhayr
e80f59742d
Fixes #7316
2014-12-10 00:56:26 +10:30
Amunak
e068d9f8d4
Blast doors' sprite now doesn't disappear when damaged - fixes #7341
2014-12-09 14:50:36 +01:00
Zuhayr
bc394b72d6
Fixes diona and simple_animals eating snacks.
2014-12-09 22:14:41 +10:30
Segrain
4fb83010e1
Fix for #7322 .
2014-12-09 14:55:25 +03:00
Segrain
4ae3d3029f
Fix for #6643 .
2014-12-09 14:54:20 +03:00
Segrain
065d9b110c
Fix for #6476 .
2014-12-09 14:52:43 +03:00
Zuhayr
79fbc2cde9
Fixes autolathe menu.
2014-12-09 21:32:40 +10:30
Zuhayr
7bc72fb836
Tidied up/fixed up the rig back icons.
2014-12-09 21:01:17 +10:30
Zuhayr
ff2c23714f
Bunch of diona nymph tweaks/fixes.
2014-12-09 20:52:41 +10:30
Loganbacca
9fce8921ac
Tape fixes
...
- All paper variants now have taped icon states (might change this to an overlay in future)
- Tape objects inherit overlays from attached papers
2014-12-09 22:53:49 +13:00
Loganbacca
2b98f70f9f
Science goggles overlay fix
2014-12-09 22:05:14 +13:00
PsiOmega
239eb2a0e8
Fixes #7323 .
...
pAIs no longer check and cut wires when interacting with radio functionality.
2014-12-09 09:10:49 +01:00
PsiOmega
924955a4c8
Merge remote-tracking branch 'upstream/master' into dev-freeze
2014-12-09 09:07:38 +01:00
Zuhayr
6a8aa48cac
Merge pull request #7309 from PsiOmegaDelta/DiscoIsDead
...
Fixes #7308 .
2014-12-09 18:18:21 +10:30
Zuhayr
b44321775e
Merge pull request #7276 from mwerezak/poster
...
Poster fixes
2014-12-09 18:17:46 +10:30
Segrain
4b7b910311
Fix for #7324 .
2014-12-09 09:39:05 +03:00
PsiOmegaDelta
f9e59d430b
Merge pull request #7329 from mwerezak/talisman
...
Adds image for cult talismans
2014-12-09 07:26:10 +01:00
mwerezak
ab89ce59dc
Merge remote-tracking branch 'upstream/dev-freeze' into poster
...
Conflicts:
code/game/objects/effects/decals/contraband.dm
2014-12-09 00:17:22 -05:00
Segrain
a311da90fb
Fix for #7330 .
2014-12-09 07:39:38 +03:00
Segrain
827a14ca69
Fix for #6649 .
2014-12-09 07:37:43 +03:00
Ccomp5950
6ade2b46a0
Merge pull request #7282 from mwerezak/tape-roll
...
Adds tape rolls to the tool storage spawner list
2014-12-08 20:46:58 -05:00
