cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-25 08:51:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
47,428 Commits 29 Branches 2 Tags
cd23b41b20ce569ff42d4fbff00a789bdb3b9729
Commit Graph

4198 Commits

Author SHA1 Message Date
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
Fox McCloud
e5c1d9767f Merge pull request #12830 from SteelSlayer/holopara-cancel 
Adds a confirmation message to guardian creating items; Allows users to cancel using them
 2020-03-14 15:50:51 -04:00
Fox McCloud
a400e8b1c8 Merge pull request #12896 from farie82/clingvampagent-fix 
Vamps and cling on agent + cling/vamp rounds will spawn now
 2020-03-14 15:41:37 -04:00
Fox McCloud
c8b6b26428 Merge pull request #12902 from Cazdon/wizardEnd 
Wizard Apprentices pass the IsWizard check. Wizard rounds end when all Wizards and Apprentices are dead.
 2020-03-14 15:40:09 -04:00
AffectedArc07
5baaabe12e Merge branch 'master' into var/const-to-define 2020-03-09 10:33:59 +00:00
variableundefined
5f8614e7d9 Merge pull request #12801 from Cazdon/pylonWallFix 
Pylons now create artificer cult walls instead of real cult walls.
 2020-03-08 00:05:34 -05:00
Fox McCloud
19a7db3e47 Merge pull request #12682 from moxian/abductor-linebreak 
Add missing linebreaks to abductor endscreen report.
 2020-03-07 18:54:42 -05:00
AffectedArc07
8671439f11 Merge branch 'master' into var/const-to-define 2020-02-22 16:30:01 +00:00
Joseph Knutson
f59497fa09 Cult Fixes and Tweaks: Admins can cult anyone, Constructs get their comms back. (#12816) 
* allows admins to cult anyone

* Constructs get cult chat again

* made it ONLY cult constructs get cult comms
 2020-02-15 20:23:52 -07:00
Citinited
fddff1049b [Testmerge ready] Ports tool behaviours; refactors all tools; adds functionality for self-filling reagent containers (#11700) 
* Adds support for self-filling reagent containers

* Sets tool_behaviour on the default set of tools

* Fixing merge conflicts

* Refactors welder to use tool behaviour

* The refactor: part I

* The refactor: part II

* Tool Refactor Part III: Revenge of the Maint

* Tool Refactor Part IV: A New Hope

* Tool Refactor Part V: The Oldcoder Strikes Back

* Tool Refactor Part VI: Return of the Coder

* VII

* Holy shit, it compiles?!

* Nannek I completed your TODO, you owe me ice cream

* Tool helpers; telepad is compliant

* Bugtest, Round 1: Fight

Fuck refactoring disposals

* Buggfixing, Round 2: Electric Boogaloo

* Personal crafting uses tool behaviours now

* Construction datums use new tool behaviours; better way of handling fueltank refuelling; more bugfixing

* multitool_check_buffer change; removes some useless things in tool_helpers

* proc name change

* TRUE/FALSE changes

* Bugfixing, Round 3: A Good Day To Bugfix Hard

Fixes multiple issues raised by the testmerge

* Minor style changes
 2020-02-15 13:31:08 -07:00
farie82
5b1941e784 Fixes a few runtimes (#12893) 
* Some runtime fixes

* fixes #12892

* Alternative fix. Better behaviour

* qdel atmos thingy when loc is null

* Eye colour init protection

* Whoops. Forgotten /

* Suggestions update

* Fixed a runtime where IPCs losing their arms would cause a runtime in the hand

* Fixes mobs being able to nuzzle a grill to dead and a runtime there

* Added extra logging to the NPCpools
 2020-02-14 22:17:29 -07:00
farie82
3f006d2701 Doomsday device fix (#12976) 2020-02-14 20:22:49 -05:00
SteelSlayer
5da783a823 Merge branch 'master' into holopara-cancel 2020-02-14 14:44:33 -06:00
AffectedArc07
c64bc93649 Replaces all var/const with #define 2020-01-28 21:25:20 +00:00
unknown
4b3e3a67f4 Apprentices are not traitors. IsWizard checks apprentices as well. Wizard Rounds End when all Wizard/Apprentices die, even if other antagonists are alive. 2020-01-11 19:57:59 -05:00
joep van der velden
3ef5b122bf Sets the special_role statuses to trait_vamp and cling_vamp 2020-01-10 14:10:46 +01:00
farie82
19ae2b1254 Revert "Move the handle_changeling proc call to the (new) life signal" 2019-12-24 13:50:40 +01:00
SteelSlayer
b317b49cb0 ding dong 2019-12-22 13:58:26 -06:00
SteelSlayer
d74d13c382 Adds a confirmation message to guardian creation items; Allows users to cancel using them 
period
 2019-12-21 15:31:14 -06:00
Drakeven
c68060f803 Added_Pylon_healing_to_Wizards (#12743) 2019-12-17 22:32:44 -05:00
Crazy Lemon
cc72b2fa5e Merge pull request #12811 from Kyep/link_update_2 
Domain link updates 2
 2019-12-16 19:55:08 -08:00
Crazy Lemon
fbb0c0dc1e Merge pull request #12735 from Cazdon/constructFaction 
Improves Construct/Shade faction handling.
 2019-12-16 19:07:22 -08:00
Crazy Lemon
90e4f2b7f2 Merge pull request #12702 from TDSSS/abductor-announce 
Announces why shuttle is called on abductor victory
 2019-12-16 18:56:49 -08:00
Kyep
fc650c273a domain links update 2 2019-12-16 18:55:51 -08:00
unknown
4df1db1c13 changed to artificer walls 2019-12-13 15:49:27 -05:00
joep van der velden
08bceebcb1 Move the handle_changeling proc to a signal 2019-12-12 16:20:38 +01:00
Joseph Knutson
819fd9d6a3 Cult Hotfix - Comments out Off_Station role check (#12765) 2019-12-01 19:05:40 -05:00
SteelSlayer
4353b47cf5 Fixes some unlisted traitor issues from a recent merge (#12756) 
* Fixes some unlisted traitor issues from a recent merge
 2019-12-01 15:42:34 -05:00
Luca
0ab4a87c5d Further_Updated_Special_Role_Traitor 2019-11-21 12:02:47 +11:00
unknown
e1afee0e78 review changes 2019-11-17 01:20:59 -05:00
unknown
01fb3f2c46 review changes 2019-11-16 20:10:32 -05:00
unknown
6866822640 byond black magic, casing fixed 2019-11-16 15:32:42 -05:00
unknown
71ba80cfda Cleaned up unintended dirty change 2019-11-16 14:27:29 -05:00
unknown
fa55b253b0 Constructs/Shades removed from cult on death, and logged as antags if made by wizard/cultist. Shades now properly deleted when construct is created. 2019-11-16 13:49:06 -05:00
unknown
28a4e6a343 constructs have wiz-hud 2019-11-16 11:21:07 -05:00
TDSSS
c8027fcc5f Fixes blobbernaut vision never clearing (#12725) 2019-11-14 20:01:09 -05:00
Cazdon
0925b08923 Rite of Offering - Refactors Convert and Sacrifice into one rune, fixes Sacrifice bugs. (#12571) 2019-11-11 09:00:37 -05:00
datlo
ac23355576 Prevent offstation roles from being converted (#12577) 2019-11-09 22:39:18 -05:00
SteelSlayer
15694dad68 List SSD and AFK panel fix (#12600) 2019-11-09 22:32:54 -05:00
TDSSS
711eeecd01 incorporated message into shuttle call, changed wording 2019-11-06 13:24:18 +01:00
TDSSS
736b7129c0 Initial commit 2019-11-06 02:12:36 +01:00
moxian
43183d7f15 Add missing linebreaks to abductor endscreen report. 2019-10-31 07:32:45 +00:00
farie82
a54c6d6541 fixes the blob runtimes and invisble blob zombies (#12614) 2019-10-27 00:24:06 -04:00
Fox McCloud
00f5e0613c Stamina Damage Rework (#12591) 2019-10-27 00:23:22 -04:00
AzuleUtama
3586683ef7 Vampire shapeshift and DNA scrambler clear flavourtext on use (#12546) 2019-10-15 20:07:40 -04:00
Fox McCloud
45bb5241f0 Training Wheels Come Off (#12587) 2019-10-15 19:22:42 -04:00
farie82
8694644cca Make cult whispering use their real name (#12560) 2019-10-15 00:50:11 -04:00
craftxbox
1a24a794d4 Fixes teleport runes teleporting AI eye (#12510) 2019-10-08 21:28:37 -04:00
Fox McCloud
5194094d3a Refactors Zone Selection (#12523) 2019-10-08 21:11:09 -04:00
Pidgey
2913fd0988 Issue #5066 - Abductor silencer now properly silences radios temporarily. (#12458) 2019-10-08 21:04:28 -04:00