Commit Graph

61 Commits

Author SHA1 Message Date
AffectedArc07 f3d903acf3 Makes closets Initialize() (#15137) 2020-12-20 08:25:29 -05:00
Farie82 8e386fcad8 Revert the workaround for byond version 1537. Bump min version for travis (#15118)
* Revert "Makes code 513.1537 compliant (#15093)"

This reverts commit 5ccbbf1192.

* bump version
2020-12-15 13:33:41 +00:00
Qwertytoforty cbfe03c850 Adds contractor baton to rep uplink, fulton has warning that it doesnt work on station (#15087) 2020-12-14 11:45:47 +00:00
dearmochi d2e034d80d Fixes Captain being contractor target, contractor batons not stunning silicon (#15096) 2020-12-12 16:25:25 +00:00
AffectedArc07 5ccbbf1192 Makes code 513.1537 compliant (#15093)
* Makes code 513.1537 compliant

* Apply suggestions from code review

Co-authored-by: Farie82 <joepvelden@hotmail.com>

Co-authored-by: Farie82 <joepvelden@hotmail.com>
2020-12-12 08:57:57 -05:00
dearmochi eb5cd4c0f3 [Speedmerge] Fixes contracts not being sent to TGUI (#15078) 2020-12-09 19:19:25 -05:00
dearmochi 5edee29a50 [READY] Syndicate Contractors (#14605)
* Syndicate Contractors initial PR

* Finalize initial version

DNP

Finalize initial version

* Baton now costs 6 Rep, show dead extraction penalty, fix scroll

* Reduce total TC, add zippo, balloon, icon tweaks

* Address moxian, AA and Farie

* Fix mode.txt

* oops

* Address Farie 2

* Tweak baton to work around stam crits, address SteelSlayer

* Address TM issues, TP menu

* Fix wrongly merged DME

* Tick contractor DM files again

* Remove step_y

* TC rewards always higher than preceding difficulty's reward

* Address Farie

* Remove extraction_turf from handle_target_return

* fix doc

* Merge part2

* Address AA again
2020-12-09 12:03:23 -05:00
mochi e336780fe2 Address AA 2020-11-04 21:16:32 +01:00
mochi 72ddc710e5 Auto-highlight code words, view code words in Secrets 2020-11-02 22:18:53 +01:00
mochi aaa79c5a3e Fix gimmick teams, missing poll icon 2020-09-02 12:05:06 +02:00
mochi 96bf4396a0 Merge branch 'master' into overhaul-event-mob-selection 2020-08-12 01:22:52 +02:00
AffectedArc07 110db94ce0 Merge pull request #13512 from trololiver112/hijack-hud
Adds a custom antag hud icon to traitor hijackers
2020-08-09 18:29:27 +01:00
AffectedArc07 debcf5dad0 Replaces all "var " with "var/" 2020-07-29 10:06:00 +01:00
SteelSlayer 0766f5541b fox changes 2020-07-13 21:56:31 -05:00
mochi 977a022d40 Convert remaining pollCandidates, remove original proc 2020-07-10 11:07:11 +02:00
SteelSlayer 177152e9ed Adds some more action buttons for malf AI abilities, removes the malfunction tab 2020-06-12 15:18:15 -05:00
trololiver112 a26d21d4d4 Adds a custom antag hud to traitor hijackers 2020-05-29 19:09:57 +02:00
AffectedArc07 210f8badf4 Makes all global variables handled by the GLOB controller (#13152)
* Handlers converted, now to fix 3532 compile errors

* 3532 compile fixes later, got runtimes on startup

* Well the server loads now atleast

* Take 2

* Oops
2020-03-20 21:56:37 -06:00
AffectedArc07 04ba5c1cc9 File standardisation (#13131)
* Adds the check components

* Adds in trailing newlines

* Converts all CRLF to LF

* Post merge EOF

* Post merge line endings

* Final commit
2020-03-17 18:08:51 -04:00
Ty-Omaha 99cc8b920e malf ai 2020-01-17 08:32:24 -05:00
SteelSlayer bacbd01cf6 Traitor clown fixes 2019-12-01 18:47:03 -06:00
Luca 0ab4a87c5d Further_Updated_Special_Role_Traitor 2019-11-21 12:02:47 +11:00
Luca e0dd0e8f00 Traitor Fix 2019-11-20 13:30:37 +11:00
SteelSlayer 0e3a484c42 Fixes a bunch of things related to mindslaves (#12491) 2019-10-03 14:08:54 -04:00
Mark van Alphen 6bd0d0813a Revert "Revert "Datumizes traitors and mindslaves"" (#12378) 2019-09-25 19:47:16 -07:00
Fox McCloud 3eb4ad0ed5 Maintainers Have No Sense of Right or Wrong (#12381) 2019-09-24 15:15:05 -07:00
Dave 2230fc3227 Revert "Datumizes traitors and mindslaves (#11969)" (#12376) 2019-09-21 19:32:52 -07:00
SteelSlayer 94bb14bb29 Datumizes traitors and mindslaves (#11969) 2019-09-21 16:50:03 -07:00
Arkatos1 102e27b3c2 Magic with style update 2019-06-04 00:37:42 +02:00
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