Commit Graph

32 Commits

Author SHA1 Message Date
Arkatos1 e985bb672e Merge https://github.com/ParadiseSS13/Paradise into WizardRevenge 2019-05-13 22:21:48 +02:00
AffectedArc07 f35c87dc19 Merge branch 'master' into ss-ticker 2019-05-13 18:14:00 +01: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
AffectedArc07 510c210930 Merge 2019-05-09 17:06:35 +01:00
Mark van Alphen a83c36179b Clarify switch message 2019-05-08 20:13:21 +02:00
Mark van Alphen d5df7456b1 Reinforcement number fix 2019-05-05 01:26:08 +02:00
Arkatos1 7363c31ea9 Initial commit 2019-04-30 23:59:28 +02:00
AffectedArc07 ec790efeaa SSticker 2019-04-30 16:47:47 +01:00
variableundefined 31a2779bae Merge pull request #11259 from Markolie/flukeops
Nuke Ops updates and buffs
2019-04-18 07:16:31 +08:00
Mark van Alphen 73780fcb21 Spacing fix 2019-04-16 16:01:54 +02:00
Mark van Alphen 2285754948 Make sure it actually works 2019-04-08 19:28:48 +02:00
Mark van Alphen c7b4179e46 Make reinforcements spawn with basic gear and 0 telecrystals 2019-04-08 19:10:10 +02:00
Mark van Alphen ddc3a02ab3 Fix thermal for saboteur, reinforcement bugfix, re-add C4 pack 2019-04-07 23:04:43 +02:00
Mark van Alphen 16dd2860f4 Remove debug and re-add spawning as a cyborg 2019-04-07 22:42:04 +02:00
Mark van Alphen f63b587f54 Nuke ops updates 2019-04-07 21:57:22 +02:00
Fox McCloud 8446632fbc The Nations Update Everyone Deserves! 2019-04-06 20:30:04 -04:00
Arkatos1 57405b8dd1 Redundant objective line removed, improved descriptions 2019-03-28 01:18:17 +01:00
Arkatos1 df64907f6b Broken morph introduction into proper paragraphs for better readibility, minor description changes 2019-03-28 00:02:28 +01:00
Arkatos1 303f2b31cf Adds Bottle of Ooze for wizards, with custom icon 2019-03-27 19:55:55 +01:00
datlo fbf58ffafd remove unnecessary srcs 2019-02-23 19:25:31 +00:00
datlo e8d83c1aca Allow nuke ops to choose to play as a borg 2019-02-10 13:42:07 +00:00
Aurorablade b812736517 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into EXTERMINATUSPARTONE 2019-01-19 23:35:15 -05:00
datlo 07a38a3a26 fix borg spawner logic error 2019-01-16 10:22:31 +00:00
datlo 4e10283b00 fix indentation
dream maker wtf
2019-01-07 20:20:00 +00:00
datlo f293ef1354 fix exploit 2019-01-07 19:51:27 +00:00
datlo d66b8d9f20 functional 2019-01-06 21:51:22 +00:00
Aurorablade 86d2a1634c Casing correction 1 2018-12-17 00:07:37 -05:00
Alffd e2e5f71ec7 Remove fartbased everything 2018-11-26 21:48:45 -05:00
Fox McCloud 3825b4e1d5 Refactors Spark Spread Activation 2018-10-17 14:31:07 -04:00
Anasari e598cc46bf Merge remote-tracking branch 'origin/master' into TGRefundPort 2018-06-19 07:46:31 +08:00
Fox McCloud c46cd7835b Datumizes Wishgranter 2018-05-20 15:48:29 -04:00