cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-24 08:22:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,670 Commits 29 Branches 2 Tags
fb8313308e5c92c079ed730191ea5611771bea21
Commit Graph

32342 Commits

Author SHA1 Message Date
Arkatos1
fb8313308e added action button ability to lock or unlock them in place 2019-05-21 22:44:54 +02:00
Arkatos1
ca708563e5 more fixes 2019-05-20 21:02:53 +02:00
Arkatos1
72abc2665e fixes for cling aug vision and general action buttons 2019-05-20 15:42:20 +02:00
variableundefined
8eddb60313 Merge pull request #11547 from AffectedArc07/prefs-fix 
Re-alphabetises prefs
 2019-05-20 16:00:05 +08:00
Fox McCloud
c31dfee6b1 Merge pull request #11556 from AffectedArc07/var-move 
Moves a global var around
 2019-05-19 16:46:18 -04:00
Fox McCloud
9f9d13dbd0 Merge pull request #11555 from Arkatos1/hissfix 
You can no longer hiss while muzzled
 2019-05-19 16:45:55 -04:00
Fox McCloud
702a3081d4 Merge pull request #11554 from Arkatos1/swapfix 
Changeling Swap Forms fix
 2019-05-19 16:45:29 -04:00
Fox McCloud
53eca25401 Merge pull request #11551 from Arkatos1/ghostfix 
Ghost vision lighting fix
 2019-05-19 16:43:35 -04:00
AffectedArc07
513c926cb1 Come on you need friends 2019-05-19 20:36:58 +01:00
Arkatos1
69cb37bf22 fixed a case where you could hiss while muzzled 2019-05-19 21:26:47 +02:00
Arkatos1
bb4ac3d14b swap forms fix 2019-05-19 20:46:27 +02:00
Arkatos1
d2f50269d7 fixed ghost vision 2019-05-19 19:47:46 +02:00
AffectedArc07
3221827576 Re-alphabetises prefs 2019-05-19 08:11:37 +01:00
Fox McCloud
d61c34e537 Merge pull request #11546 from Shadeykins/Paper-Exploit 
Fixes paper.dm issue
 2019-05-18 16:26:57 -04:00
Fox McCloud
cbe4fe9b2e Merge pull request #11533 from Markolie/lighting 
Rotatium fix
 2019-05-18 15:44:07 -04:00
Shadeykins
7249cd84b5 Word choice. 2019-05-18 13:24:35 -06:00
Shadeykins
69e50ae70b Fixes potential paper exploit. 2019-05-18 13:21:38 -06:00
tayyyyyyy
e288355182 Avoid announcing admin jobs 2019-05-18 02:01:32 -07:00
variableundefined
19c8a8265e Merge pull request #11486 from Tayyyyyyy/better_ert_spawn 
Non-blocking ERT selection/spawn
 2019-05-17 23:07:30 +08:00
variableundefined
41b175f470 Merge pull request #11480 from Tayyyyyyy/messages_window 
Make it easier to slide into DMs
 2019-05-17 19:20:22 +08:00
variableundefined
909c1d4d71 Merge pull request #11479 from TDSSS/rejuv-change 
Lets vamp and cling anti-stun powers remove sleep too
 2019-05-17 19:18:35 +08:00
variableundefined
7076f2718b Merge pull request #11477 from Arkatos1/smartoutput 
Smartfridge gets smarter
 2019-05-17 19:18:01 +08:00
variableundefined
3338d8b907 Merge pull request #11476 from Arkatos1/inhand 
New inhand sprites
 2019-05-17 19:17:32 +08:00
variableundefined
16c352abd1 Merge pull request #11472 from Couls/code-phrase 
Remove non-manifest names from the code phrases
 2019-05-17 19:17:01 +08:00
variableundefined
719ffda09e Merge pull request #11438 from Emanthealmighty/AdminCultist-change 
Admin created cultists can now properly summon their Gods.
 2019-05-17 19:15:39 +08:00
variableundefined
1e62ac30ad Merge pull request #11439 from Arkatos1/LingIcons 
Changeling Evolution - Action Buttons!
 2019-05-17 19:15:16 +08:00
Mark van Alphen
4ccf04124c Rotatium fix 2019-05-16 18:50:18 +02:00
Fox McCloud
238780cae6 Merge pull request #11511 from Markolie/lighting 
Make the lighting plane master respect client color and other lighting fixes
 2019-05-15 20:42:44 -04:00
Mark van Alphen
330708a578 Fix mining bot mesons 2019-05-15 23:08:24 +02:00
AffectedArc07
f35c87dc19 Merge branch 'master' into ss-ticker 2019-05-13 18:14:00 +01:00
Fox McCloud
c2df74312e Prevents Future SSTicker from Runtiming 2019-05-13 03:18:34 -04:00
variableundefined
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
Mark van Alphen
0033dbd7d9 Fix pAI flashlight 2019-05-11 19:22:56 +02: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
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