cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-13 11:01:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
43,527 Commits 27 Branches 2 Tags
2dca2ad4248df121dfe032a7b6cb47da2e66b58d
Commit Graph

3273 Commits

Author SHA1 Message Date
variableundefined
64c0cf7a0b Merge pull request #11074 from farie82/refactor-pickup-and-fix-bomb 
Refactored pickup code and fixed the bomb guardian bug
 2019-03-23 20:04:15 +08:00
variableundefined
7950a53d37 Merge pull request #11049 from Tails2091/lockbox-fix 
Lockbox now kicks user out upon locking #11046
 2019-03-23 19:59:05 +08:00
joep van der velden
e83a7131cc Refactored pickup code and fixed the bug 2019-03-18 16:42:44 +01:00
Tails2091
8865cbeb83 3 is now 2 and 4 is now 3 
My bad.
 2019-03-17 17:01:54 -04:00
Tails2091
e4b9988b85 Lockbox now kicks user out upon locking 2019-03-15 12:53:00 -04:00
Couls
2f23d50740 Make text blue 2019-03-11 21:44:32 -04:00
Couls
7b08f73b25 Add a line about ctrl-clicking 2019-03-11 20:51:12 -04:00
variableundefined
6549234b8c Merge pull request #10968 from Fox-McCloud/his-grace 
His Grace Binds His Will
 2019-03-07 08:49:05 +08:00
variableundefined
fbf6f3617e Merge pull request #10980 from Fox-McCloud/fixes-genetics 
Fixes Genetic Powers Activation
 2019-03-03 08:52:52 +08:00
Fox McCloud
b39a54c95a Fixes Genetic Powers Activation 2019-03-02 19:33:53 -05:00
Fox McCloud
8318ca338c tweaks 2019-03-02 10:10:04 -05:00
Fox McCloud
6bd0ecfab0 tweaks 2019-03-02 10:03:09 -05:00
Dave
ebe99e8986 Applies what my mom taught me about conflict resolution 2019-03-01 18:51:04 -05:00
Fox McCloud
185f5d5fd6 better code, fixes, and tweaks 2019-03-01 00:09:48 -05:00
Fox McCloud
b47057b452 whoops 2019-02-28 19:18:12 -05:00
Fox McCloud
705a4c27a0 His Grace Binds His Will 2019-02-28 19:12:48 -05:00
Kyep
ebf2ebc6b8 Fox suggestions 2019-02-27 18:33:10 -08:00
Kyep
513ed740f1 Fixes broken SE block injectors 2019-02-26 19:26:24 -08:00
variableundefined
db26f9bcc4 Merge pull request #10892 from UmeFuu/master 
New cookies recipe (previous one was a bit silly)
 2019-02-26 17:04:31 +08:00
UmeFuu
923e372926 Deletes leftover code 2019-02-25 21:55:52 -03:00
Fox McCloud
b8a9f127bf Adds Upgraded Cybernetic Heart 2019-02-25 01:15:53 -05:00
Dave
e5d01311d6 Review Concerns 2019-02-23 23:00:53 -05:00
Dave
5664206697 review changes 2019-02-17 14:44:49 -05:00
Unknown
5ab0af3b25 Medical QoL PR 2019-02-15 00:10:08 -05:00
UmeFuu
75f49c435c Fix typo 2019-02-13 21:34:36 -03:00
UmeFuu
c72a623ec6 Fixes cookie tray code 
Makes it kinda shorter, more flexible for future variations of cookies.
 2019-02-13 17:37:54 -03:00
Alex Gospodchikov
fffbe4e6f1 Made lighter size consistent 2019-02-13 18:38:54 +03:00
UmeFuu
5db7dafc38 Adds new circular cutter 
Needed for the new cookies recipe and maybe future recipes
-----
Fixed, it didn't work before for some reason
 2019-02-13 00:16:17 -03:00
UmeFuu
4f371cb7c2 Adds trays with cookies 
Adds two trays, one with x6 cookies and the other with x6 sugar cookies, needed for the new cookies recipe.
 2019-02-12 20:28:54 -03:00
UmeFuu
ca2fa7c3b3 Adds new circular cutter 
Needed for the new cookies recipe and maybe future recipes
 2019-02-12 20:26:12 -03:00
variableundefined
943a21a776 Merge pull request #10818 from datlo/freegolems 
Port Mineral golems and Free Golems
 2019-02-11 20:37:07 +08:00
variableundefined
a9ce346fd2 Merge pull request #10849 from Fox-McCloud/switch-straps 
Allows Leather Satchel Strap Switching
 2019-02-10 15:46:51 +08:00
Fox McCloud
d61fa732f3 Allows Leather Satchel Strap Switching 2019-02-08 16:46:07 -05:00
Fox McCloud
dc09d07d86 Reduces Defib Safe Time: Adds Health HUD Defib Indicator 2019-02-07 00:49:24 -05:00
datlo
481208ae9c add robo access, space cleaners, fix bana golem bug 2019-02-05 02:51:40 +00:00
datlo
0358bfef42 fix bugs, remove cult free golems 2019-02-04 13:11:11 +00:00
datlo
0ff947ec17 Added golem custom access, boards, and a free KA 
You must mine for the trigger guard kit before being able to use the KA
 2019-02-03 18:27:24 +00:00
datlo
e9e2d1a2e9 add ID registering 2019-02-03 16:59:59 +00:00
datlo
f06e88d82d Remove base access from golem ID, buff golem KA 2019-02-03 14:35:11 +00:00
datlo
224f32bab3 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into freegolems 2019-02-03 06:41:02 +00:00
datlo
74a3631741 compilin and mostly workin 
has runtimes due to body color
need to wrap up commented procs
 2019-02-03 06:40:50 +00:00
Fox McCloud
01d20eb7af Ensures Some Diseases Cannot Be Cheesed 2019-02-02 17:50:05 -05:00
variableundefined
1e22ffa784 Merge pull request #10793 from AzuleUtama/iveGotAPresentForYa 
Adds Pack of C-4 Explosives
 2019-02-02 09:45:10 +08:00
variableundefined
d382fa1c7c Merge pull request #10761 from datlo/agentidfixes 
Refactors agent ID phototaking, misc ID fixes/improvements
 2019-02-01 10:17:08 +08:00
variableundefined
d26a08e373 Merge pull request #10768 from datlo/itspaydayfellas 
Updates syndi kits, add armored suit jacket
 2019-01-31 11:30:27 +08:00
AzuleUtama
d826f51dcb Adds the pack of c4 explosives 2019-01-31 01:50:32 +00:00
Aurorablade
d3448cf287 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into EXTERMINATUSPARTONE 2019-01-29 17:42:39 -05:00
datlo
a2ee8a0d7e Updates syndi kits, add armored suit jacket 
- Adds two suit jackets to the arrivals locker vendor
- Adds the armored suit jacket to armors. Same defense as standard
security armor.
- Adds the executive suit and armored jacket to Bond, Payday, and
Professional syndi kits
- Replaces the X4 in Payday by a C4
- Reskins the thermal glasses in Professional to look like sunglasses.
Does not provide flash protection.
- Replaces the toolbox in professional by a pair of combat gloves.
 2019-01-28 18:37:58 +00:00
datlo
38384e5058 Add all syndicate access to syndicate_command id 2019-01-27 21:25:58 +00:00
datlo
94f6ae5c49 split "reset card option" in two 2019-01-27 21:18:24 +00:00