cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-05 07:02:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
47,428 Commits 26 Branches 2 Tags
cd23b41b20ce569ff42d4fbff00a789bdb3b9729
Commit Graph

2179 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
farie82
ec19ea3d2d Rename TOUCH to REAGENT_TOUCH fix (#13135) 2020-03-17 16:40:44 -04:00
Fox McCloud
93c870a2be Implements A Couple Goon Reagents (#13110) 
* Implements A Couple Goon Reagents

* taste
 2020-03-17 15:02:24 -04:00
variableundefined
4c24624313 Merge pull request #13027 from Fox-McCloud/goonchem-heparin 
Goonchem: Heparin Rework
 2020-03-14 23:53:42 -04:00
Fox McCloud
8ce3b1da16 Merge pull request #12932 from AffectedArc07/var/const-to-define 
Replaces all var/const with #define
 2020-03-14 15:33:44 -04:00
AffectedArc07
5baaabe12e Merge branch 'master' into var/const-to-define 2020-03-09 10:33:59 +00:00
Fox McCloud
47263ded27 Merge remote-tracking branch 'upstream/master' into cig-tweaks 2020-03-08 22:35:49 -04:00
variableundefined
edebec5194 Merge pull request #13021 from Fox-McCloud/add-cbd 
Adds CBD
 2020-03-08 21:46:20 -04:00
Fox McCloud
42eb7fb4c4 Merge pull request #12875 from Aquilar/naniteoversightfix 
Making Nanites also fix internal bleeding.
 2020-03-08 03:32:04 -04:00
Fox McCloud
47fec9a889 Merge pull request #12921 from Qwertytoforty/master 
Allows vox to drink synthanol without throwing up
 2020-03-07 18:40:04 -05:00
Fox McCloud
4d9c89bdc0 menthol 2020-03-06 23:48:32 -05:00
AffectedArc07
a1fa46f5a8 Merge branch 'master' into var/const-to-define 2020-03-03 22:44:07 +00:00
variableundefined
461490a007 Merge pull request #13034 from Fox-McCloud/goonchem-addiction-rework 
Goonchem: Addiction Rework
 2020-03-02 00:53:41 -05:00
Fox McCloud
24a56ae4fe fix for medical chems 2020-03-01 23:33:38 -05:00
Citinited
04217a1e2c Some bugfixes 2020-02-27 21:02:09 +00:00
Fox McCloud
47926f3e35 tweaks 2020-02-26 19:58:30 -05:00
Fox McCloud
565bdd06ca Goonchem: Addiction Rework 2020-02-26 19:27:40 -05:00
Fox McCloud
9d9d6a8666 Goonchem: Heparin Rework 2020-02-24 18:29:08 -05:00
Fox McCloud
c55ce4aab3 Adds CBD 2020-02-23 19:46:29 -05:00
AffectedArc07
8671439f11 Merge branch 'master' into var/const-to-define 2020-02-22 16:30:01 +00: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
Qwertytoforty
c60e20db52 removes the last spaces and makes the code work 2020-02-07 17:49:28 -05:00
Qwertytoforty
7255ef3de0 Fixes wrong button press 2020-02-07 15:22:50 -05:00
Qwertytoforty
99611d8388 Fixes tabs, removes conflicts 2020-02-07 15:19:32 -05:00
Qwertytoforty
7db0f17b13 changes spaces to tabs 2020-02-07 15:13:55 -05:00
AffectedArc07
c64bc93649 Replaces all var/const with #define 2020-01-28 21:25:20 +00:00
Qwertytoforty
7327ead964 Revert "Revert "Makes synthanol check for PROCESS_SYN instead of !M.isSynthetic"" 
This reverts commit 36d65344ab.
 2020-01-23 21:02:49 -05:00
Qwertytoforty
a9712c0dde Revert "Makes synthanol check for PROCESS_SYN instead of !M.isSynthetic" 
This reverts commit 5eb5b0939a.
 2020-01-23 21:02:49 -05:00
Qwertytoforty
0bf702513c Makes synthanol check for PROCESS_SYN instead of !M.isSynthetic 2020-01-23 21:02:49 -05:00
Qwertytoforty
64f9e1da09 Revert "Revert "Makes synthanol check for PROCESS_SYN instead of !M.isSynthetic"" 
This reverts commit 36d65344ab.
 2020-01-23 20:47:05 -05:00
Qwertytoforty
36d65344ab Revert "Makes synthanol check for PROCESS_SYN instead of !M.isSynthetic" 
This reverts commit 5eb5b0939a.
 2020-01-23 20:40:55 -05:00
Qwertytoforty
5eb5b0939a Makes synthanol check for PROCESS_SYN instead of !M.isSynthetic 2020-01-23 20:39:58 -05:00
Aquilar
0fe3459acd This commit is to fix a minor oversight with nanites and adminordrazine so it fixes internal bleeding, this solves a few edge cases where the user will bleed out due to multiple instances of internal bleeding. 
Signed-off-by: Aquilar <20759278+Aquilar@users.noreply.github.com>
 2020-01-03 16:26:21 +08:00
Crazy Lemon
a9589ac7e7 Merge pull request #12711 from SteelSlayer/chem-bag-to-grinder 
Chemistry bag QoL improvement
 2019-12-16 18:53:42 -08:00
Crazy Lemon
528d28edcf Merge pull request #12728 from SteelSlayer/spray-logging 
Changes the spray bottle admin attack log messages
 2019-12-16 18:49:12 -08:00
VeteranKyl
58f494da2d Fixes Spore Toxin Not Working 2019-12-01 15:47:33 -05:00
SteelSlayer
87a8a933e8 remove useless parentheses 2019-11-14 10:53:22 -06:00
SteelSlayer
468ebe87e0 temp based cleaner logs, uses Join() 2019-11-12 10:17:54 -06:00
SteelSlayer
55bf2fe756 Spray bottle admin attack log tweaks 2019-11-12 05:03:43 -06:00
SteelSlayer
21960b8722 fixes some backwards return logic 2019-11-11 16:36:27 -06:00
SteelSlayer
7a04e5ee9b indention and logic cleanup 2019-11-08 10:42:59 -06:00
SteelSlayer
7b15c9e301 Forgot to include this 2019-11-07 19:19:47 -06:00
SteelSlayer
79af914dc1 Chemistry bag QoL improvement 2019-11-07 17:53:38 -06:00
Fox McCloud
00f5e0613c Stamina Damage Rework (#12591) 2019-10-27 00:23:22 -04:00
Fox McCloud
d6a6debf94 Traits framework (#12548) 2019-10-15 20:12:46 -04:00
Fox McCloud
45bb5241f0 Training Wheels Come Off (#12587) 2019-10-15 19:22:42 -04:00
Fox McCloud
5194094d3a Refactors Zone Selection (#12523) 2019-10-08 21:11:09 -04:00
Fox McCloud
affa319fab Removes Console Screens (#12512) 2019-10-08 21:07:50 -04:00
Fox McCloud
a4641cc0cf Removes Dirty Floors (#12519) 2019-10-08 20:58:05 -04:00
Fox McCloud
93fa76bee0 Fixes Blood Types (#12520) 2019-10-07 23:15:54 -04:00