cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-15 16:17:36 +01:00
Code Issues Packages Projects Releases Wiki Activity
63,724 Commits 17 Branches 2 Tags
dependabot/github_actions/actions/setup-python-7.0.0
Commit Graph
1698 Commits
Author SHA1 Message Date
Fox McCloud d29be05f74 the-figment-that-was-is-now-gone 2019-10-01 19:08:15 -04:00
Fox McCloud 2224229fad Merge remote-tracking branch 'upstream/master' into universal-damage 2019-09-30 14:18:33 -04:00
Fox McCloud ca5a552dec red ones do go faster 2019-09-28 02:31:10 -04:00
Fox McCloud 9097dfcacf Merge remote-tracking branch 'upstream/master' into universal-damage 
# Conflicts:
#	code/game/machinery/machinery.dm
#	code/game/objects/items.dm
#	code/game/objects/structures.dm
#	code/game/objects/structures/inflatable.dm
#	code/game/objects/structures/mirror.dm
#	code/modules/clothing/spacesuits/hardsuit.dm
#	code/modules/clothing/suits/wiz_robe.dm
#	code/modules/mob/living/carbon/alien/alien_defense.dm
#	code/modules/mob/living/carbon/slime/slime.dm
#	code/modules/mob/living/simple_animal/friendly/slime.dm
 2019-09-28 00:16:11 -04:00
Fox McCloudandvariableundefined cb8529cdb8 Makes Xenobiology Simpler. Removes Slimes (#12398) 2019-09-24 16:17:33 -07:00
Fox McCloudandvariableundefined 86e6d85093 Nutrition Refactor (#12389) 2019-09-24 15:17:55 -07:00
Fox McCloud 62226851d9 Merge remote-tracking branch 'upstream/master' into universal-damage 2019-09-23 12:53:52 -04:00
Fox McCloudandvariableundefined efc79cfc7c Removes Bodyscanner Console (#12377) 2019-09-22 21:11:02 -07:00
Fox McCloudandvariableundefined c87389a595 TG Buckle Update (#12375) 2019-09-22 18:22:57 -07:00
Fox McCloud aa49033844 nor-shall-our-souls-falter 2019-09-17 16:06:09 -04:00
Fox McCloud 6f637b6014 Merge remote-tracking branch 'upstream/master' into universal-damage 2019-09-17 11:24:58 -04:00
Fox McCloud 788f1926fb though-our-bodies-be-ravaged 2019-09-15 19:49:52 -04:00
Coul 84a6a10b9b review comments 2019-09-15 10:45:21 -04:00
Fox McCloud af92373d33 though-this-world-may-be-broken 2019-09-15 05:53:43 -04:00
Coul 00c3b6ad41 limit the amount of monkeys spawned from monkey cubes 2019-09-14 21:18:45 -04:00
Fox McCloud 0854f75f7b Fixes Pugs 2019-09-06 19:06:41 -04:00
Fox McCloud a54cac4887 foxes are canines 2019-09-05 19:18:24 -04:00
Fox McCloud dca6d98f5f Refactors Corgis 2019-09-04 18:40:34 -04:00
variableundefinedandGitHub 1dc8e66cbc Merge pull request #11772 from Couls/constructable-rechargers 
[READY] Constructable Rechargers and machinery tweaks
 2019-08-23 09:16:37 -04:00
Crazy LemonandGitHub 3313efed23 Merge pull request #11981 from Fox-McCloud/lavaland-update 
Major Lavaland Update
 2019-08-16 22:22:49 -06:00
variableundefinedandGitHub 11e9ecadbf Merge pull request #11894 from TheSardele/blender 
Makes All-In-One Grinders constructable
 2019-08-16 20:41:18 +08:00
Fox McCloudandGitHub 3634687a88 Merge pull request #11374 from Quantum-M/removeTeleBoards 
Removes telescience boards from RnD
 2019-08-11 16:28:47 -04:00
Fox McCloud f9c0fd2d25 fixes 2019-08-11 15:33:00 -04:00
Fox McCloud ee0447dad6 Major Lavaland Update 2019-08-10 22:36:55 -04:00
TheSardele a4485969db Cleans up some reagentgrinder code 
Removes a double check and fixes the circuit board description.
 2019-07-21 10:18:19 +02:00
TheSardele 30f313cb93 Makes All-In-One Grinders constructable 
All-In-One Grinders can now be constructed from a machine frame using the appropriate circuit board, 2 manipulators and a matter bin.
 2019-07-19 17:58:52 +02:00
Couls cf31a774a5 Rechargers can be built now 
Rechargers now use capacitors as their stock parts and recharge faster depending on the quality of the recharger(may need balancing)
Can now also place smaller machinery on tables by clicking on the table while pulling them(microwaves and soda dispensers are some examples)
 2019-07-01 01:19:17 -04:00
variableundefinedandGitHub 12b20b594d Merge pull request #11738 from evankhellparadise/portableseed 
Portable Seed Extractor design
 2019-06-29 09:23:22 +08:00
Evankhell caad8f8e5e Portable Seed Extractor 2019-06-21 20:06:06 -04:00
Couls fc2488c80e new medical category in mechfab 2019-05-13 01:36:11 -04:00
variableundefinedandGitHub 56977dc052 Merge pull request #11376 from Arkatos1/Cardboard 
Cardboard can now be made in the Biogenerator
 2019-04-29 23:08:16 +08:00
Arkatos1 85cb74bec5 Cardboard can now be made in the Biogenerator 2019-04-25 12:27:32 +02:00
Arkatos1 fea1721d80 Pill Bottles are now printable in the Autolathe 2019-04-25 00:01:57 +02:00
B.A.L d1f6ffc7aa Removes boards 2019-04-21 14:52:59 -07:00
variableundefinedandGitHub 391104fdb0 Merge pull request #11243 from CornMyCob/plasmacutter-buff 
Makes the plasma cutter less shit
 2019-04-18 07:35:27 +08:00
Fox McCloud 06713d604f Atmos Define Cleanup + Plasma Tweaks 2019-04-09 11:22:01 -04:00
CornMyCob de3d84124a plasma cutter changes 2019-04-05 18:56:20 +01:00
variableundefinedandGitHub 06a9770ae4 Merge pull request #11157 from Fox-McCloud/chem-master-refactor 
ChemMaster Refactor
 2019-04-01 23:06:42 +08:00
variableundefinedandGitHub 456320cbe0 Merge pull request #11144 from Fox-McCloud/chem-dispenser-refactor 
Chem Dispenser Refactor
 2019-03-29 20:28:14 +08:00
Fox McCloud be1a2b4452 ChemMaster Refactor 2019-03-28 19:41:17 -04:00
Fox McCloud d0ea5ee8b9 Crit Rework Final Submission 2019-03-28 17:28:00 -04:00
Fox McCloud 41c03e03d9 Chem Dispenser Refactor 2019-03-26 18:29:11 -04:00
Eman 515fb58163 Can now collar any animal that has gained sentience. 
This makes it so that upon becoming sentient, either by the xenobiology sentience/transference potion or by the random sentience event, it is possible to put a collar on you.
 2019-03-22 16:52:14 +01:00
variableundefinedandGitHub eee376ba0d Merge pull request #11052 from Fox-McCloud/goon-smoke 
[Goonchem] Implements Goon Smoke
 2019-03-22 17:45:11 +08:00
variableundefinedandGitHub 570678a41f Merge pull request #10896 from Jazz23/Xenobio-Addition 
Xenobio TG port
 2019-03-17 20:36:16 +08:00
Fox McCloud f01af6ae20 Implements Goon Smoke 2019-03-15 19:09:29 -04:00
AffectedArc07 ca5f456f79 whoops 2019-03-09 10:31:37 +00:00
AffectedArc07 8bef0cd2e2 Adds in cell management console 2019-03-09 10:31:35 +00:00
variableundefinedandGitHub c3de57a13f Merge pull request #10973 from Jazz23/Potion-Fix 
Adds mousedrop to speed/fire potions
 2019-03-08 22:27:16 +08:00
Jazz23 e9827f8c96 Didn't know this function existed 2019-03-03 07:20:55 -08:00