acbf627f8c
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into bundles
...
# Conflicts:
# code/modules/clothing/glasses/glasses.dm
# code/modules/customitems/item_defines.dm
2019-05-13 22:08:49 +02:00
f35c87dc19
Merge branch 'master' into ss-ticker
2019-05-13 18:14:00 +01:00
10c1d71d53
Merge pull request #11483 from datlo/golem-traitor-fix
...
Fix golem getting selected as auto traitors
2019-05-12 07:39:27 +08:00
86d5b4b070
Handles APC spoopiness differently
2019-05-11 23:32:32 +01:00
0033dbd7d9
Fix pAI flashlight
2019-05-11 19:22:56 +02:00
cd3b25bd24
Boo affects APCs again
...
Also reworks the boo code
2019-05-11 18:15:13 +01:00
f825a08503
Fixes can_equip and refactors it
2019-05-11 15:19:43 +02:00
e9a382a6f2
show if ckey is whitelisted before removing them
2019-05-10 19:14:51 -07:00
6c887b5482
Merge pull request #11508 from datlo/Fixnukieborgspawn
...
Fix ghosts being asked the wrong nukie role
2019-05-10 15:04:17 -07:00
fc243495b6
Merge pull request #11471 from Markolie/goggles
...
Add debugging night vision glasses for Reyblood
2019-05-10 14:43:43 -07:00
5b14cf120d
Make lighting plane master respect client color
2019-05-10 20:34:11 +02:00
1b0defba92
fixes merge conflict
2019-05-10 09:56:58 -07:00
f4de59a4f8
adds whitelist functionality
2019-05-10 09:54:20 -07:00
5dbc319fa9
add cyborg to the role name
2019-05-10 15:07:46 +01:00
7042d4fb77
Fix ghosts being asked the wrong nukie role
...
#11492 mixed up which players gets which role.
The role being selected is the role that the player using the spawner
will play, so the role that the ghost gets is the other one.
🆑
fix: Ghosts will no longer get the wrong role offered when a nukie
spawns a borg and will properly be informed whether they will spawn as a
nuke ops or a syndi cyborg.
/🆑
2019-05-10 14:42:26 +01:00
1c74f848e1
Merge https://github.com/ParadiseSS13/Paradise into LingIcons
2019-05-10 14:41:08 +02:00
edee2cfcea
Replace by job check
2019-05-10 13:36:35 +01:00
a8af6f53c3
Merge pull request #11501 from Markolie/lighting
...
Fix X-Ray on death for simple mobs
2019-05-09 16:53:49 -04:00
665659bd88
Asynchronously spawn ERT
2019-05-09 11:52:28 -07:00
afc22b03ed
Fix X-Ray on death for simple_mobs, fix view variables damage for non-humans
2019-05-09 19:52:29 +02:00
8131b3976c
Fix style
2019-05-09 10:29:32 -07:00
510c210930
Merge
2019-05-09 17:06:35 +01:00
f656b11989
Merge pull request #11492 from Markolie/loadoutfix
...
Clarify nuclear operative/syndicate cyborg switch acceptance message
2019-05-09 00:11:47 -07:00
1da2454f1e
Merge pull request #11499 from Fox-McCloud/drifting-ghosts
...
Fixes Ghosts Drifting
2019-05-09 00:08:30 -07:00
4b36f5e6fb
Merge pull request #11497 from Kyep/loadout_point_fix
...
Fixes $5+ donors not getting extra loadout points
2019-05-08 23:55:53 -07:00
eb95a42672
Fixes Ghosts Drifting
2019-05-09 02:51:44 -04:00
bc0749c99d
Fixes Toggles Not Saving Properly
2019-05-09 02:37:13 -04:00
3820abb1ff
Merge pull request #11493 from Fox-McCloud/mob-icon-fix-maybe
...
Generic Layering and forceMove fixes
2019-05-09 12:06:48 +08:00
75bfb77007
fix for $5+ donors not getting more loadout points
2019-05-08 19:12:53 -07:00
3d90ccbfb7
nevermind, just generic fixes
2019-05-08 20:15:24 -04:00
531201fab4
Merge branch 'master' into hooks-part4
2019-05-08 22:21:12 +01:00
6563a01bec
Merge pull request #11489 from Markolie/lighting
...
Lighting fixes
2019-05-08 16:17:12 -04:00
bc91f78c93
Shuttle and map fixes
2019-05-08 22:05:11 +02:00
27e4ca3d19
Animate typing indicator
2019-05-08 12:47:37 -07:00
2618def9a1
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
...
# Conflicts:
# _maps/map_files/Delta/delta.dmm
# _maps/map_files/MetaStation/MetaStation.v41A.II.dmm
# _maps/map_files/MetaStation/z4.dmm
# _maps/map_files/RandomRuins/SpaceRuins/derelict5.dmm
# _maps/map_files/RandomRuins/SpaceRuins/spacebar.dmm
# _maps/map_files/RandomZLevels/spacebattle.dmm
# _maps/map_files/cyberiad/cyberiad.dmm
# _maps/map_files/cyberiad/z4.dmm
# _maps/map_files/cyberiad/z6.dmm
# _maps/map_files/generic/z5.dmm
# code/__DEFINES/misc.dm
# code/__HELPERS/unsorted.dm
# code/game/objects/structures/lattice.dm
# code/game/turfs/space/space.dm
# code/modules/mob/mob.dm
# code/modules/ruins/ruin_areas.dm
# paradise.dme
2019-05-08 21:40:35 +02:00
e5c2dfe535
Add typing indicator
2019-05-08 11:37:55 -07:00
a83c36179b
Clarify switch message
2019-05-08 20:13:21 +02:00
8161196627
Allow admins to force open conversation
2019-05-08 09:48:50 -07:00
9b60ea5d95
Make sure the screen is reset, just in case
2019-05-08 17:22:24 +02:00
71e3d5187f
Lighting fixes: makes sure new_players have a HUD and that sight flags are reset properly
2019-05-08 17:18:27 +02:00
79815eb042
Merge pull request #11357 from Markolie/lighting
...
Lighting system update
2019-05-08 00:27:16 -04:00
a6045d14ad
Highlight active tab
2019-05-07 16:43:11 -07:00
29f95173fc
This wont cause a problem *server dies*
2019-05-07 22:08:38 +01:00
014d803eba
Merge branch 'master' into hooks-part4
2019-05-07 21:22:59 +01:00
6c174cdee5
Merge pull request #11315 from farie82/Species-transformation-fix
...
Fixes species transformations not retaining items correctly
2019-05-07 16:56:21 +08:00
fcc4216ccd
Add unread indicator
2019-05-06 20:36:42 -07:00
c669d642d4
Add archiving and admin buttons
2019-05-06 19:32:17 -07:00
a127f00b5a
Add h4 tag to make things blue
2019-05-06 18:12:32 -07:00
5b5e0a86a1
Add messages window
2019-05-06 12:13:58 -07:00
7ce4a99516
better output system for smartfridges
2019-05-06 16:52:13 +02:00
Mark van Alphen