Commit Graph

32559 Commits

Author SHA1 Message Date
Citinited 86d5b4b070 Handles APC spoopiness differently 2019-05-11 23:32:32 +01:00
Mark van Alphen 0033dbd7d9 Fix pAI flashlight 2019-05-11 19:22:56 +02:00
Citinited cd3b25bd24 Boo affects APCs again
Also reworks the boo code
2019-05-11 18:15:13 +01:00
joep van der velden f825a08503 Fixes can_equip and refactors it 2019-05-11 15:19:43 +02:00
Kyep e9a382a6f2 show if ckey is whitelisted before removing them 2019-05-10 19:14:51 -07:00
Crazy Lemon 6c887b5482 Merge pull request #11508 from datlo/Fixnukieborgspawn
Fix ghosts being asked the wrong nukie role
2019-05-10 15:04:17 -07:00
Crazy Lemon fc243495b6 Merge pull request #11471 from Markolie/goggles
Add debugging night vision glasses for Reyblood
2019-05-10 14:43:43 -07:00
Mark van Alphen 5b14cf120d Make lighting plane master respect client color 2019-05-10 20:34:11 +02:00
Kyep 1b0defba92 fixes merge conflict 2019-05-10 09:56:58 -07:00
Kyep f4de59a4f8 adds whitelist functionality 2019-05-10 09:54:20 -07:00
datlo 5dbc319fa9 add cyborg to the role name 2019-05-10 15:07:46 +01:00
datlo 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
Arkatos1 1c74f848e1 Merge https://github.com/ParadiseSS13/Paradise into LingIcons 2019-05-10 14:41:08 +02:00
datlo edee2cfcea Replace by job check 2019-05-10 13:36:35 +01:00
Crazy Lemon 987dfeb436 Merge pull request #11470 from fludd12/conversation-starter
Project Mind / Scan Mind
2019-05-09 16:38:40 -07:00
Fox McCloud a8af6f53c3 Merge pull request #11501 from Markolie/lighting
Fix X-Ray on death for simple mobs
2019-05-09 16:53:49 -04:00
Mark van Alphen 9f192885d3 Regex fix after merge conflict 2019-05-09 22:33:47 +02:00
Mark van Alphen aad23a771c Fix serialize 2019-05-09 22:30:07 +02:00
Mark van Alphen bf06a3e2aa Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into regexnttc
# Conflicts:
#	code/game/machinery/telecomms/ntsl2.dm
2019-05-09 22:27:47 +02:00
Mark van Alphen a5d6f56927 Disable NTTC regex 2019-05-09 22:26:02 +02:00
Fel 2ed9e5d3d7 Sensation: *fades* 2019-05-09 15:32:57 -04:00
Fel 2a1f26ff8c You should've gone for the \ref
*snap
2019-05-09 15:19:05 -04:00
tayyyyyyy 665659bd88 Asynchronously spawn ERT 2019-05-09 11:52:28 -07:00
Mark van Alphen afc22b03ed Fix X-Ray on death for simple_mobs, fix view variables damage for non-humans 2019-05-09 19:52:29 +02:00
tayyyyyyy 8131b3976c Fix style 2019-05-09 10:29:32 -07:00
AffectedArc07 510c210930 Merge 2019-05-09 17:06:35 +01:00
Crazy Lemon f656b11989 Merge pull request #11492 from Markolie/loadoutfix
Clarify nuclear operative/syndicate cyborg switch acceptance message
2019-05-09 00:11:47 -07:00
Crazy Lemon 1da2454f1e Merge pull request #11499 from Fox-McCloud/drifting-ghosts
Fixes Ghosts Drifting
2019-05-09 00:08:30 -07:00
Crazy Lemon 60fbcd0eb5 Merge pull request #11495 from TDSSS/turret-cover-fix
Prevents turret covers from being moved by atmos
2019-05-08 23:56:49 -07:00
Crazy Lemon 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
Fox McCloud eb95a42672 Fixes Ghosts Drifting 2019-05-09 02:51:44 -04:00
Fox McCloud bc0749c99d Fixes Toggles Not Saving Properly 2019-05-09 02:37:13 -04:00
Fox McCloud 23c884e14c Merge pull request #11494 from Markolie/lighting
Lighting fixes
2019-05-09 00:09:16 -04:00
variableundefined 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
Mark van Alphen 458e59a191 Final weather fix 2019-05-09 05:53:53 +02:00
Mark van Alphen b66ac0559e Add initial plane to weather 2019-05-09 05:23:14 +02:00
Mark van Alphen 502b8aebc5 Weather lighting fix 2019-05-09 05:09:54 +02:00
Kyep 75bfb77007 fix for $5+ donors not getting more loadout points 2019-05-08 19:12:53 -07:00
Fox McCloud 70cc1de343 abductor stuff 2019-05-08 21:01:41 -04:00
Mark van Alphen 967ebb6805 Update water plane 2019-05-09 02:21:38 +02:00
Fox McCloud 3d90ccbfb7 nevermind, just generic fixes 2019-05-08 20:15:24 -04:00
TDSSS 9833f4c7f0 Initial commit 2019-05-09 02:10:39 +02:00
Mark van Alphen 443fa06c31 Update our getFlatIcon() code to /tg/'s latest 2019-05-09 02:01:26 +02:00
Fox McCloud 61b337578b Potentially Solves Disappearing Human Mob Issue? 2019-05-08 17:25:35 -04:00
AffectedArc07 531201fab4 Merge branch 'master' into hooks-part4 2019-05-08 22:21:12 +01:00
Fox McCloud 06438856cd Merge pull request #11490 from Markolie/wind
Fix windoor click opening
2019-05-08 16:17:41 -04:00
Fox McCloud 6563a01bec Merge pull request #11489 from Markolie/lighting
Lighting fixes
2019-05-08 16:17:12 -04:00
Mark van Alphen bc91f78c93 Shuttle and map fixes 2019-05-08 22:05:11 +02:00
tayyyyyyy 27e4ca3d19 Animate typing indicator 2019-05-08 12:47:37 -07:00
Mark van Alphen 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