Mloc-Hibernia
f2924c9f57
Merge remote-tracking branch 'upstream/dev' into bs12-zuhweapons
2014-05-11 13:48:51 +00:00
Zuhayr
c63c681caa
Double whoops.
2014-05-11 13:45:30 +00:00
Mloc-Hibernia
f606f35690
fix messy merge resolution
...
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com >
2014-05-11 13:26:28 +00:00
Mloc-Hibernia
e3a8d5eb43
Merge remote-tracking branch 'upstream/master' into dev
...
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com >
Conflicts:
code/game/objects/effects/spawners/bombspawner.dm
2014-05-11 13:19:09 +00:00
Zuhayr
582a8e817a
Fixes a runtime with drones building lights.
2014-05-11 22:31:27 +09:30
Zuhayr
45255e9e2e
Whoops.
2014-05-11 22:07:24 +09:30
Zuhayr
a570f02835
Removed a redundant line.
2014-05-11 22:03:28 +09:30
Zuhayr
85279c97c4
Added toggle verb for drones.
2014-05-11 22:00:34 +09:30
Zuhayr
538bba9c42
Join As Drone and drone rebooting will now check cyborg jobbans.
2014-05-11 21:38:45 +09:30
Zuhayr
ff56d3e1bb
Added drone fabricators to the map in their own area. Replaced Vox crossbows with spike throwers.
2014-05-11 21:38:29 +09:30
Zuhayr
84ec5b6849
Merge branch 'weapons' of https://github.com/Zuhayr/Baystation12 into dev
2014-05-11 20:44:25 +09:30
Loganbacca
f32d281132
Compressed matter implanter fix
...
Compressed matter implanters will now correctly remove the compressed item from the game world if it is in an inventory (player or storage container).
2014-05-11 18:30:18 +12:00
Mike
cee43ffbf3
Fixes internal storage on ground
...
Fixes not being able to remove items from internal storage when the
master item is on the ground.
2014-05-10 23:41:48 -04:00
Mike
6e391c01c9
Accessories are now visible when attached
...
Uses overlays.
I was originally planning to use the SOUTH direction of the
icons/mob/ties.dmi image as the overlay, however this had problems with
the fact that those images are directional. Rather than override Move()
in clothing/under to reset dir to SOUTH whenever clothing with an
attached accessory was thrown or dragged, I thought it would be less
hacky to read the overlays from a separate .dmi.
2014-05-10 22:30:09 -04:00
Mike
f3ea0ab223
Fixed accessories becoming improperly detached...
...
when the host suit was clicked on. It is also now clearer who has the
responsibility for attaching and removing accessories.
2014-05-10 20:37:15 -04:00
Mloc-Hibernia
1d2ce01039
mob: fix #4955
...
Name parameter to track wasn't sanitized correctly.
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com >
2014-05-10 22:33:33 +00:00
Chinsky
963216b43b
Merge pull request #4952 from Mloc/bs12-mineturfs
...
mining: fix for mining cooling down
2014-05-11 01:47:30 +04:00
Chinsky
799c279a86
Merge pull request #4950 from Mloc/bs12-pipefixes
...
Map fixes
2014-05-11 01:47:18 +04:00
Hubblenaut
952d7c9e93
Adds ability to photocopy paper bundles
2014-05-10 19:03:42 +02:00
Chinsky
3e52109077
Merge pull request #4949 from Zuhayr/master
...
Fixes.
2014-05-10 13:02:23 +04:00
Ccomp5950
699cbbfd96
Merge pull request #4941 from Zuhayr/dev
...
Maintenance drones.
2014-05-10 03:55:21 -05:00
Ccomp5950
69148b4dc9
Merge pull request #4953 from Loganbacca/bayfix
...
Ore duplication bug fix
2014-05-10 03:23:20 -05:00
Ccomp5950
4243b1ed61
Merge pull request #4943 from Intercross21/master
...
Special color for antagonists in logs and fix of alien whitelist
2014-05-10 03:17:15 -05:00
Ccomp5950
025576828a
Merge pull request #4942 from mwerezak/radsuit-storage
...
Rad suits can hold rad hoods and gasmasks
2014-05-10 03:09:18 -05:00
Loganbacca
b3af8e8936
Ore duplication bug fix
...
Fixes #4951
2014-05-10 14:32:08 +12:00
Zuhayr
a57ec7acdd
Fixes #4810
2014-05-10 10:45:17 +09:30
Zuhayr
a68c4e9c55
Fixes #3993
2014-05-10 10:26:05 +09:30
Mloc-Argent
0911bbd0e7
mining: fix for mining cooling down
...
Hacky thing that was already done to space. TCMB->T0C
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-05-09 22:47:55 +01:00
Mloc-Argent
c9a2a4fad0
power: cables show up right on map again
...
Cables are red/whatever color on map again instead of white.
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-05-09 18:53:44 +01:00
Zuhayr
7ded31ce4c
Merge pull request #4921 from Jarcolr/UnusedIcons
...
Adds 5 satchels for jobs when selecting "satchel" for backpack pref from code
2014-05-10 02:41:57 +09:30
Chinsky
c9a658db0d
Merge pull request #4945 from Ccomp5950/adminoops
...
Re-adds Show Player Panel right click menu on players.
2014-05-09 20:47:30 +04:00
Chinsky
cb3ef4dc19
Merge pull request #4936 from Hubblenaut/paperbundle
...
Paperbundle
2014-05-09 20:43:08 +04:00
Zuhayr
5e682668b2
Cherrypicking vox spike throwers, made crossbows and pneumatic cannons constructable.
2014-05-10 02:10:06 +09:30
Zuhayr
1fc3ecf145
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
2014-05-10 01:56:57 +09:30
Zuhayr
1a24e08f36
Adds drones, drone fabrication, commit options. This is the squashed version of the original 22 commit pull, so I'm summarizing.
2014-05-10 01:40:11 +09:30
Zuhayr
8d6b5e6d5c
Fixes #4911
2014-05-10 01:23:29 +09:30
Zuhayr
a95dd47de3
Fixes #4744
2014-05-10 00:40:20 +09:30
Zuhayr
1dc85149ce
Fixes #4716
2014-05-10 00:33:09 +09:30
Zuhayr
9f2f5fb488
Fixes #4808
2014-05-10 00:30:03 +09:30
Zuhayr
1e63e27f3b
Fixes #4918
2014-05-10 00:27:18 +09:30
Jarcolr
dd8ce90fa7
Else Ifs
2014-05-09 16:06:44 +03:00
Loganbacca
c697b7a9b6
Null message fix
...
Fixes the "User places in the glass ashtray" messages having a null object name.
2014-05-10 00:37:48 +12:00
Zuhayr
656c555f4a
Merge pull request #4914 from Jarcolr/ColoredLabcoats
...
Adds 5 new colored lab coats
2014-05-09 22:03:01 +09:30
Zuhayr
4d64af69f4
Fixes #4923
2014-05-09 21:29:44 +09:30
Ccomp5950
e4089f2fd0
Re-adds Show Player Panel right click menu on players.
2014-05-09 05:41:43 -05:00
Intercross21
1f261fdadd
Fix for alien whitelist
2014-05-09 09:20:55 +04:00
Mike
06c2002cfb
Rad suits can hold rad hoods and gasmasks
...
Allows rad hoods and gasmasks to be "clipped" to radiation suits using
the suit storage.
2014-05-08 22:14:19 -04:00
Mloc-Argent
2d99a65cdf
Merge remote-tracking branch 'upstream/master' into dev
2014-05-08 19:27:02 +01:00
Hubblenaut
e277349e0e
dynamic description and fixes
2014-05-08 20:15:25 +02:00
Chinsky
5426670a3d
Merge pull request #4938 from Ccomp5950/banned_strikethrough
...
Jobs you can't select are struckthrough instead of just being red.
2014-05-08 13:26:37 +04:00
