Mark van Alphen
f42b9cf383
Merge branch 'master' into admin_interact
2017-02-18 15:41:16 +01:00
Fox McCloud
38e6c45407
Merge pull request #6465 from Allfd/CoughSneezeFix
...
Fixes cough and sneeze oversight
2017-02-18 07:58:31 -05:00
Fox McCloud
4617206927
Merge pull request #6487 from Crazylemon64/fix_mindswap
...
Mind transfer works again
2017-02-18 07:52:05 -05:00
Crazylemon64
f5f7383ab8
Fixes a speech_span runtime
2017-02-17 22:44:19 -08:00
Crazylemon64
e9ef99d68d
Mind transfer works again
2017-02-17 21:54:13 -08:00
allfd
e435701531
Adds unique Vox coughs and sneezes
2017-02-17 18:39:24 -05:00
Mark van Alphen
dea264faf2
Merge branch 'master' into stationgoals
2017-02-17 18:05:15 +01:00
Krausus
4754d6b4b3
Fixes some sounds not being cached properly
2017-02-17 02:37:26 -05:00
allfd
8a7b1ad2fc
Fix list issue
2017-02-15 22:46:10 -05:00
allfd
d3444658c9
Fixes cough and sneeze oversight
2017-02-15 22:11:32 -05:00
Crazylemon64
9eb59bd590
Squishy cough
2017-02-15 02:00:51 -08:00
Crazylemon64
36762c70f5
Ruins immersion
2017-02-14 23:51:54 -08:00
Crazy Lemon
4366ba550e
Merge pull request #6300 from Alexshreds/disease_effects
...
Adds Cough and Sneeze Sounds
2017-02-14 23:38:23 -08:00
Crazy Lemon
77a98d9a21
Merge pull request #6408 from KasparoVy/Fixing-VoxTailBug
...
Fixes Vox-tail Bug
2017-02-14 23:24:49 -08:00
Crazy Lemon
dd4a64ea6a
Uses evil memetainer powers
...
Pre-emptively prevents empty list runtimes
2017-02-14 22:49:41 -08:00
Crazy Lemon
96afaca62c
Merge pull request #6293 from KasparoVy/deadchat-anon-pref
...
Makes Deadchat Anonymity Persistent as a Preference
2017-02-14 20:54:27 -08:00
KasparoVy
87aa937d8d
Fixes a bug w/ frankenstein limbs and Excises mob icobase/deform so the organs handle it.
...
Fixes a bug w/ the first commit where frankenstein limbs got converted to the owner's appearance (icobase/deform) if the owner HAS_ICON_SKIN_TONE.
2017-02-14 21:39:40 -05:00
Crazy Lemon
ebe28b3372
Merge pull request #6425 from Markolie/stackprogressbars
...
Progress bars now stack vertically
2017-02-14 13:27:47 -08:00
Crazy Lemon
1e84d34559
Merge pull request #6351 from tigercat2000/goonchat_administrator_tools
...
Goonchat Admin Filters
2017-02-14 13:09:24 -08:00
KasparoVy
46158e7854
conflict resolution
2017-02-13 06:35:17 -05:00
Fox McCloud
90f034b470
Merge pull request #6097 from Kyep/terrorspiders-PR2
...
Terror Spiders - Part 2
2017-02-13 06:27:32 -05:00
Fox McCloud
300751373d
Merge pull request #6280 from fludd12/Grey-Wingdings
...
Wingdings Revival^2
2017-02-13 06:26:56 -05:00
Kyep
f8647a2108
Crazylemon spacing changes
2017-02-12 19:52:37 -08:00
Markolie
d0247fff2c
Progress bars now stack vertically. Also adds a bunch of lazy list helpers.
2017-02-12 23:51:50 +01:00
KasparoVy
6b50f16a12
Fixes Vox-tail Bug
...
When a new Vox spawns in, your tail won't suddenly break (become a
different colour).
Abstracts icobase/deform/tail from the species definitions a bit so
individual mobs can have a different icobase/deform/tail than other mobs
of the same species.
2017-02-12 02:28:15 -05:00
Markolie
f701813f6e
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into admin_interact
...
# Conflicts:
# code/modules/client/client defines.dm
2017-02-12 00:03:49 +01:00
Markolie
900653ea0e
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into fixxxxx
2017-02-11 20:31:23 +01:00
Markolie
4d857de148
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into stationgoals
...
# Conflicts:
# icons/effects/beam.dmi
2017-02-11 18:26:06 +01:00
uraniummeltdown
3df3688e72
move all crates to crates.dmi
2017-02-11 17:44:20 +04:00
Kyep
9f20cb1685
Fixes merge conflict in event_container
2017-02-10 22:07:05 -08:00
Fox McCloud
04f5276047
Merge pull request #6350 from Markolie/lavaland_updates
...
Add remaining Lavaland loot, kinetic accelerator refactor
2017-02-11 00:02:42 -05:00
Crazy Lemon
cef7f35ce3
Merge pull request #6161 from tigercat2000/goonlights
...
Goonlights
2017-02-10 19:21:20 -08:00
Crazy Lemon
17281506d2
Merge pull request #6123 from KasparoVy/vulp-cblind
...
Vulpkanin & Tajara mod. Colour Vision, Darksight to Eyes, Internal Mech(assist) Organ Icons
2017-02-10 18:27:58 -08:00
Markolie
b0d4f5d92a
Various fixes
2017-02-10 18:55:23 +01:00
Markolie
c14b560ee0
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into fixxxxx
2017-02-10 18:21:06 +01:00
Markolie
c93a592102
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_updates
...
# Conflicts:
# code/modules/shuttle/supply.dm
2017-02-10 18:19:53 +01:00
Markolie
0117892f54
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into admin_interact
...
# Conflicts:
# code/game/machinery/doors/firedoor.dm
2017-02-10 18:18:29 +01:00
Markolie
1e97a262b8
Admin interaction fixes
2017-02-10 01:20:01 +01:00
Markolie
403b512c9b
Merge if conditions
2017-02-09 23:29:10 +01:00
Markolie
2afd77a54a
Split admin interaction into regular and advanced, make more devices ghost-interactable
2017-02-09 19:30:36 +01:00
Markolie
0824101f0a
Sanity checking for faction copy
2017-02-09 18:57:09 +01:00
Markolie
95f750d6f2
Add faction support to pAI's
2017-02-09 18:54:26 +01:00
Markolie
1b4d73d6f7
Adding an admin_check to can_admin_interact()
2017-02-09 01:21:42 +01:00
Markolie
3077fb42bf
Add logging to opening/closing job slots and hacking bots
2017-02-09 00:56:05 +01:00
Markolie
32a96111c3
Bot interaction update
2017-02-09 00:22:21 +01:00
Markolie
4a155bfb50
Admin interaction update
2017-02-08 23:27:08 +01:00
Markolie
d7f8f68ff8
Fix posibrain whispering while muted
2017-02-08 22:12:59 +01:00
Markolie
3298f7edce
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_updates
...
# Conflicts:
# icons/obj/objects.dmi
2017-02-08 19:25:47 +01:00
Markolie
7039ac7a6f
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into construction
...
# Conflicts:
# _maps/map_files/cyberiad/cyberiad.dmm
2017-02-08 19:21:57 +01:00
Crazy Lemon
2d77a0ab4d
Merge pull request #6357 from Fox-McCloud/var-edit-fixes
...
On Varedit Fixes
2017-02-07 20:01:32 -08:00
