cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-25 13:07:46 +01:00
Code Issues Packages Projects Releases Wiki Activity
60,117 Commits 12 Branches 2 Tags
dev-docs-readme
Commit Graph
2771 Commits
Author SHA1 Message Date
Mark van Alphen 14e8022daf Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into portalfix 
# Conflicts:
#	code/game/objects/effects/step_triggers.dm
 2019-08-09 23:38:49 +02:00
Fox McCloudandGitHub 3bd3e96eaa Merge pull request #11695 from Markolie/ruinsport 
Port over remaining Lavaland ruins
 2019-08-09 17:08:38 -04:00
Couls 6ee8c0d96f Merge remote-tracking branch 'upstream/master' into zombies 2019-08-04 21:05:10 -04:00
variableundefined d3f6886433 Hydroponic, food and reagent taste mult 2019-08-05 00:08:49 +08:00
Couls e4e26a60b8 clown magboots allow waddling, jesterone makes you waddle 2019-08-01 19:43:24 -04:00
variableundefined ac85e2d630 Tastes and Sushi 2019-08-01 23:53:24 +08:00
variableundefined eeb86a0d2f Stage 1 Functional Code Only 2019-07-30 20:38:03 +08:00
TheSardele effe4aeb28 Makes grinder upgrades improve it 
Matter bin upgrades now allow more items to be stored in the grinder and have them ground up at once. Manipulator upgrades make them create more reagents when grinding stuff.
 2019-07-25 23:40:12 +02: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
Crazy LemonandGitHub 8c531c4ac2 Merge pull request #11856 from Markolie/fix321 
Beaker fixes
 2019-07-20 18:54:18 -06:00
Mark van Alphen 4d8adb4f44 Fix reverse beaker logs 2019-07-21 02:03:02 +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
Mark van Alphen fd579015b1 Portal fixes - adds oldloc to Crossed() 2019-07-15 20:16:17 +02:00
Mark van Alphen 451c68ee0c Beaker drink fix 2019-07-14 21:54:38 +02:00
tayyyyyyy 57c700a814 Sanitize all inputs 2019-07-14 09:35:12 -07:00
Arkatos1 47b447619a Merge https://github.com/ParadiseSS13/Paradise into pillbottle 2019-07-12 19:40:59 +02:00
Mark van Alphen d03f4dcafb Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ruinsport 
# Conflicts:
#	paradise.dme
 2019-07-08 19:36:30 +02:00
variableundefinedandGitHub c1960f9fcf Merge pull request #11731 from Couls/patch-2 
fix typo in msg reagent
 2019-07-08 20:26:38 +08:00
variableundefinedandGitHub 742bc62c8b Merge pull request #11544 from Arkatos1/recharger 
Rechargers now show their contents and charge status on examine
 2019-07-08 20:18:36 +08:00
Arkatos1 de9da04572 Standardized colors, finished change wrapper choosing and modified templates and their sizes 2019-06-30 19:46:13 +02:00
Arkatos1 16a81d2527 Merge https://github.com/ParadiseSS13/Paradise into pillbottle 2019-06-30 16:09:38 +02:00
Arkatos1 d33d018e62 Finished colors for other prespawned pillbottles, new colors, finished template for changing wrappers in chemmaster 2019-06-30 16:08:33 +02:00
CoulsandGitHub 2e09dfbb44 fix typo in rand 2019-06-16 09:14:57 -04:00
Mark van Alphen d02165e0f9 Ruin fixes 2019-06-07 02:03:19 +02:00
Mark van Alphen ba3f65049d Port over remaining Lavaland ruins 2019-06-07 01:19:55 +02:00
Mark van Alphen cd362d6bad Wormhole jaunter fix (and replace lighting checks with simulated) and disk compartmentalizer fix 2019-06-03 21:44:01 +02:00
Mark van Alphen 6aba8f9e52 Address comments 2019-06-03 02:40:30 +02:00
Mark van Alphen 0971a45fbd Fix capitalization 2019-06-03 01:53:39 +02:00
Mark van Alphen c6e6c6cefd Even better water handling 2019-06-03 00:31:03 +02:00
Mark van Alphen fd8a9e4909 Water handling improvement 2019-06-03 00:06:29 +02:00
Mark van Alphen 697bb8eee5 More Lavaland fixes: 
- Air alarm computers will no longer display alarms that can't be remote controlled
- Survival capsules now have a NanoMed
- Fixed the disk compartmentalizer not having a sprite when something is put in
- Fixed the drying rack not having a sprite when something is put in
- Turned water bottles into glass containers so they have more functionality
- Hairless hide can now be made wet using water
- Reagents in glass containers can now be fed to others
 2019-06-02 23:29:50 +02:00
joep van der velden 71079eb598 empty and eject 2019-05-28 19:55:00 +02:00
joep van der velden a46cab1b43 The clear button from the pandemic now also ejects 2019-05-28 19:53:13 +02:00
Mark van Alphen ef479cb982 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	icons/mob/feet.dmi
#	paradise.dme
 2019-05-23 19:04:09 +02:00
Arkatos1 fdd2ca94d4 added get_cell() proc to remaining items using cells 2019-05-18 23:52:18 +02:00
Fox McCloudandGitHub cbe4fe9b2e Merge pull request #11533 from Markolie/lighting 
Rotatium fix
 2019-05-18 15:44:07 -04:00
Couls 8083b51a96 Initial commit 2019-05-16 22:36:30 -04:00
Mark van Alphen 4ccf04124c Rotatium fix 2019-05-16 18:50:18 +02:00
Mark van Alphen 0f98a95666 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	icons/mob/actions/actions.dmi
#	paradise.dme
 2019-05-13 22:14:38 +02:00
AffectedArc07 f35c87dc19 Merge branch 'master' into ss-ticker 2019-05-13 18:14:00 +01:00
variableundefinedandGitHub 10c1d71d53 Merge pull request #11483 from datlo/golem-traitor-fix 
Fix golem getting selected as auto traitors
 2019-05-12 07:39:27 +08:00
datlo edee2cfcea Replace by job check 2019-05-10 13:36:35 +01:00
AffectedArc07 510c210930 Merge 2019-05-09 17:06:35 +01:00
Mark van Alphen 2618def9a1 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	_maps/map_files/Delta/delta.dmm
#	_maps/map_files/MetaStation/MetaStation.v41A.II.dmm
#	_maps/map_files/MetaStation/z4.dmm
#	_maps/map_files/RandomRuins/SpaceRuins/derelict5.dmm
#	_maps/map_files/RandomRuins/SpaceRuins/spacebar.dmm
#	_maps/map_files/RandomZLevels/spacebattle.dmm
#	_maps/map_files/cyberiad/cyberiad.dmm
#	_maps/map_files/cyberiad/z4.dmm
#	_maps/map_files/cyberiad/z6.dmm
#	_maps/map_files/generic/z5.dmm
#	code/__DEFINES/misc.dm
#	code/__HELPERS/unsorted.dm
#	code/game/objects/structures/lattice.dm
#	code/game/turfs/space/space.dm
#	code/modules/mob/mob.dm
#	code/modules/ruins/ruin_areas.dm
#	paradise.dme
 2019-05-08 21:40:35 +02:00
Mark van Alphen bbeb07abd2 More lighting fixes 2019-05-04 03:06:10 +02:00
Mark van Alphen 35b1cee88b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	icons/obj/toy.dmi
 2019-05-03 18:31:45 +02:00
Mark van Alphen d646ab0934 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lighting 
# Conflicts:
#	code/game/area/Space Station 13 areas.dm
 2019-05-03 18:30:07 +02:00
Kyep 2cf6f1aa79 fixes add_reagent runtimes for blobs 2019-05-02 19:54:11 -07:00
Mark van Alphen ba0f6abb02 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/game/objects/items.dm
#	code/modules/power/cable.dm
#	icons/mob/inhands/items_lefthand.dmi
#	icons/mob/inhands/items_righthand.dmi
#	icons/obj/lighting.dmi
#	paradise.dme
 2019-04-30 19:26:17 +02:00
Mark van AlphenandGitHub ad2238f496 Merge branch 'master' into lighting 2019-04-30 19:15:58 +02:00