cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-30 04:02:33 +00:00
Code Issues Packages Projects Releases Wiki Activity
41,999 Commits 26 Branches 2 Tags
7795098ea291dbf30fa0f847caa7ed7d5dccbc0d
Commit Graph

18904 Commits

Author SHA1 Message Date
Kyep
7795098ea2 runtime fix 2019-01-03 15:23:48 -08:00
Kyep
0567eab562 Merge branch 'sol_trader_update' of https://github.com/Kyep/Paradise into sol_trader_update 2019-01-03 14:40:07 -08:00
Kyep
d488195799 fix merge conflict, wipe map changes 2019-01-03 14:39:41 -08:00
variableundefined
460e9b3119 Merge pull request #10574 from Nicaragua1/lazarus 
Lazarus wasnt displaying any message when emagged
 2019-01-02 20:20:44 +08:00
Nicaragua
1d1f89499e Fixed 2019-01-01 23:07:09 -03:00
Nicaragua
655ee56bfc fixed emp_act shouldn't send a message 
removed
 2019-01-01 17:24:33 -03:00
Nicaragua
f554e80706 Removing my old PR file from this 
My bad
 2019-01-01 15:06:31 -03:00
Nicaragua
87d0229e2f Lazarus wasnt showing any message when emmaging 2019-01-01 14:57:32 -03:00
Nicaragua
3e29e98171 Wrong pull. Reverting changes 
I forgot to create a new branch.
 2019-01-01 14:47:40 -03:00
Nicaragua
807fb31223 Lazarus was not displaying any message when emagging 2019-01-01 14:37:52 -03:00
Nicaragua
a8c5ed79ce Added to upgrade FireFighters with goliath plates 
Same with RIPLEY APLU, being able to upgrade it to improve its armor
 2018-12-31 13:07:04 -03:00
Shadow-Quill
14e6487532 why 2018-12-31 08:38:19 -06:00
Aurorablade
ef0171c480 Fixes Tears and Demons 2018-12-31 00:58:25 -05:00
joep van der velden
1b5322c32e Refactor a few small things to make my research level parser work and make the code less odd 2018-12-30 15:18:00 +01:00
variableundefined
d7b2648020 Merge pull request #10185 from Mitchs98/moveresist 
Ports Move Force from TG
 2018-12-28 20:53:07 +08:00
variableundefined
68a96010f9 Merge pull request #10493 from datlo/keycardallaccess 
Add access restriction removal to keycard auth device
 2018-12-28 20:52:18 +08:00
variableundefined
ce403fa368 Merge pull request #10502 from datlo/wizmagboots 
Add boots of gripping to the wizard hardsuit
 2018-12-28 20:49:15 +08:00
variableundefined
8fb5f1f03e Merge pull request #10479 from Tails2091/mouse-time 
Gives Mice *squeak Emote
 2018-12-28 20:48:48 +08:00
variableundefined
bba96abd60 Merge pull request #10508 from Spartan6/ert-tweaks 
Few ERT Tweaks
 2018-12-28 20:47:11 +08:00
variableundefined
c5fbc803d6 Merge pull request #10506 from improvedname/Syndicate-toolbox 
Adds a recipe, that allows making syndicate toolboxes
 2018-12-28 20:46:31 +08:00
variableundefined
d28fd6a502 Merge pull request #10533 from uraniummeltdown/rpdfix 
Fix RPD not appearing in Autolathe
 2018-12-28 20:45:25 +08:00
variableundefined
e872466486 Merge pull request #10482 from Mithrandalf/newhat 
Adds a Familiar Hat for dressup
 2018-12-28 20:44:23 +08:00
variableundefined
8ec2b41442 Merge pull request #10485 from v0idp/banana_cake 
Banana Cake
 2018-12-28 20:43:48 +08:00
variableundefined
d3d7fd87d5 Merge pull request #10488 from Kyep/hop_to_it 
Adds Kangaroos
 2018-12-28 20:43:02 +08:00
uraniummeltdown
30b7621062 changed brpd design datum path 2018-12-28 13:24:52 +04:00
Mithrandalf
425b5c2a8e Merge branch 'master' into newhat 2018-12-27 14:27:31 +00:00
Spartan6
1af3259a9c Added advanced analyser instead to medical bag, tweaked grammar on surgery belt and renamed Chief Engineer's toolbelt to advanced toolbelt. 2018-12-26 00:21:51 +00:00
void*
f1c8cb8498 Fixed syndicate officer showing in card modification/identification consoles 2018-12-26 01:08:56 +01:00
Spartan6
ed00d4c838 Adds flashlights to ERT, gives medical advanced medical analysers, gives Red ERT engineer Gamma suit 2018-12-25 20:38:29 +00:00
Improvedname
cdc5ae5017 push 2018-12-25 19:50:44 +01:00
Kyep
e48f659892 anti corpse cheese prevention 2018-12-25 17:44:56 +00:00
datlo
ab2c505848 Add boots of gripping 
also fix an oversight with plasmeme wizard suit check
 2018-12-25 07:36:00 +00:00
Kyep
72b335f8b0 fixes kick direction 2018-12-24 12:13:29 +00:00
datlo
ff397236b7 Reword command 2018-12-24 11:52:03 +00:00
Kyep
b93daa8c79 'merge 2018-12-24 10:55:26 +00:00
Kyep
a98107b971 throw on kick 2018-12-24 10:28:54 +00:00
datlo
34d9559c2f add access restriction removal to keycard swiper 2018-12-24 09:26:46 +00:00
void*
949ecaee2b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into banana_cake 2018-12-24 05:01:27 +01:00
variableundefined
65ca04f05d Merge pull request #10450 from datlo/toxinstechdisk 
Add toxins technology research and the Bluespace RPD
 2018-12-24 09:20:52 +08:00
variableundefined
9ebd0d255e Merge pull request #10473 from Aurorablade/HONK 
Ports Clown Goblins, Adds Honk Missle, Fixes Space Carp Event, Adds Honomoly Event
 2018-12-24 09:20:24 +08:00
variableundefined
24ebcda6c4 Merge pull request #10474 from datlo/syndicateremap2 
Adds Syndi Officer admin job and remaps SST/SIT starting areas 2
 2018-12-24 09:17:15 +08:00
variableundefined
650307eeab Merge pull request #10477 from FlattestGuitar/edgyhardsuit 
Decemviri's fluff hardsuit modkit
 2018-12-24 09:14:49 +08:00
variableundefined
e892535b27 Merge pull request #10364 from Allfd/nofunallowed 
Remove fart based mechanics
 2018-12-24 09:13:47 +08:00
Kyep
e0a79c11b4 typo 2018-12-22 16:17:31 +00:00
Kyep
980c83f124 adds kangaroos 2018-12-22 16:07:33 +00:00
Kyep
46acb9338b sunglasses, seeds, KA, IMS, fleshy 2018-12-22 14:16:25 +00:00
void*
3250f3bb8e Added banana cake to oven recipes including new icons for the cake and slice itself 2018-12-21 20:39:55 +01:00
Tails2091
08eb438de2 Added help text and removed implied parent thing 2018-12-19 17:35:52 -05:00
Mithrandalf
4b6669c23a hat added and also to vendor 2018-12-19 20:48:09 +00:00
variableundefined
e769b9582b Merge pull request #10475 from alex-gh/anomaly_fix 
Fixed anomalies being disabled by random radio traffic.
 2018-12-19 18:26:19 +08:00