cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 12:07:27 +01:00
Code Issues Packages Projects Releases Wiki Activity
60,117 Commits 14 Branches 2 Tags
dev-docs-readme
Commit Graph
639 Commits
Author SHA1 Message Date
Fox McCloudandGitHub d7d1e42cc2 Merge pull request #6678 from LordJike/carrot-tweaks 
Makes carrots processable into wedges and makes said wedges fryable into carrot fries
 2017-03-09 21:36:40 -05:00
Markolie 3aa1399995 Implement usesound/toolspeed 2017-03-07 16:46:28 +01:00
Jike 041c573f42 Makes carrot wedges available through the processor instead of cutting with a knife 2017-03-06 18:15:47 -04:30
Jike 07982121ec Carrots can be sharpened again, carrot shivs can be cut into wedges 2017-03-04 23:13:04 -04:30
Jike 7fc798b299 Full tweak 2017-03-04 05:18:02 -04:30
Crazy LemonandGitHub 9382db1767 Merge pull request #6430 from FalseIncarnate/botany2 
Botany adjustments/re-addition/fixes/whatever (RE-UPLOAD)
 2017-02-24 12:03:07 -08:00
FalseIncarnate 622f36575e A little faster 
3x -> 2x
 2017-02-13 23:33:28 -05:00
FalseIncarnate b0f46a28a1 Re-Adds Hydro Tray Covers 
Also fixed a derp with the define
 2017-02-12 23:32:49 -05:00
FalseIncarnate 030dba205d Slows Plant Aging 
Now with a define instead of a magic number for easy tweaking.
 2017-02-12 23:22:02 -05:00
Markolie f701813f6e Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into admin_interact 
# Conflicts:
#	code/modules/client/client defines.dm
 2017-02-12 00:03:49 +01:00
Markolie e6ce0924b8 Fingerprint/set_machine consistency 2017-02-10 23:37:03 +01:00
Markolie 0117892f54 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into admin_interact 
# Conflicts:
#	code/game/machinery/doors/firedoor.dm
 2017-02-10 18:18:29 +01:00
CoreyLee HassellandGitHub 88f006432b Fixed reagents in destroying angels 
Had listed amantin twice in the reagent_add function for destroying angel. Combined to 0.3
 2017-02-10 11:14:04 -05:00
Markolie 4a155bfb50 Admin interaction update 2017-02-08 23:27:08 +01:00
Crazy LemonandGitHub 4f32d8f0f8 Merge pull request #6339 from Fox-McCloud/botany-reagents 
Botany reagents Tweak
 2017-02-07 20:03:08 -08:00
Fox-McCloud 15b4fc04a5 plasma in blumpkins 2017-02-07 07:01:58 -05:00
Fox-McCloud 7d72f348c3 Fix Diona Nymph Crossing Trays--Refactors Diona Feeding 2017-02-06 21:15:19 -05:00
Fox-McCloud 462ef49c29 tweaks 2017-02-06 04:37:15 -05:00
Fox-McCloud c5f3cf94e9 replica pod people 2017-02-05 09:55:10 -05:00
Fox-McCloud 69e1c69bec fishwater re-addition 2017-02-05 09:36:27 -05:00
Fox-McCloud 3b59726371 Botany Reagent Changes 2017-02-05 06:25:39 -05:00
Fox-McCloud ccd9d9596d fungus among us 2017-02-04 05:01:03 -05:00
Fox-McCloud f8602ffef8 last fixes, hopefully 2017-02-04 04:28:42 -05:00
Fox-McCloud ed4ae3dd8f irrigation and missing sprites 2017-02-02 00:32:52 -05:00
Fox-McCloud 0415e5ab3a consistency 2017-01-31 01:39:38 -05:00
Fox-McCloud 6d4316264a plant analyzer QoL 2017-01-29 03:37:22 -05:00
Fox-McCloud 7f2e71b0df GC fixes and explosive vine fix 2017-01-28 11:06:42 -05:00
Fox-McCloud b62cffadf8 glyphosate plantbgone change 2017-01-28 08:36:08 -05:00
Fox-McCloud ae37cd143d stat fixes, runtime fix for logs 2017-01-28 06:08:44 -05:00
Fox-McCloud ec4add0ebf more fixes and runtime corrections 2017-01-28 04:03:33 -05:00
Fox-McCloud a69b3f3673 weedkiller fix 2017-01-28 03:10:54 -05:00
Fox-McCloud 80587202fe forcemove fixes 2017-01-27 21:03:57 -05:00
Fox-McCloud 9b56e9ac70 fixes and forgotten botany belt 2017-01-27 19:28:00 -05:00
Fox-McCloud d1463d9718 solving conflicts 2017-01-26 06:59:16 -05:00
Fox-McCloud 5e9e417bb4 fixing flowers 2017-01-26 06:23:10 -05:00
Fox-McCloud 73ac77e8df runtimes 2017-01-26 04:23:43 -05:00
Fox-McCloud cd93a21a97 nymphs and fixes 2017-01-26 03:38:25 -05:00
Fox-McCloud a77c40389e hydro hud working 2017-01-26 02:01:40 -05:00
Fox-McCloud 14075be4be 420 2017-01-25 02:16:12 -05:00
Fox-McCloud 084ed30446 more fixes and features 2017-01-25 01:04:01 -05:00
Fox-McCloud 36bfee25dc last of the missing stuff, hopefully 2017-01-24 18:33:22 -05:00
Fox-McCloud b1f789e104 fixes a ton of thing 2017-01-24 03:23:16 -05:00
Fox-McCloud 5b33a72486 fixesssss 2017-01-23 22:39:01 -05:00
Fox-McCloud d0b378892d Merge remote-tracking branch 'upstream/master' into botany-rework 2017-01-23 22:25:00 -05:00
Fox-McCloud 4f72f89ad8 podmen fix 2017-01-23 08:05:55 -05:00
Fox-McCloud 3e87bd3370 more adjustments and fixes 2017-01-23 05:56:17 -05:00
Fox-McCloud 5c828db250 fixes, comfrey, and aloe 2017-01-23 05:25:42 -05:00
Fox-McCloud dc0710135e more fixes 2017-01-23 00:53:44 -05:00
Fox-McCloud 104bfab759 sprite and code fixes 2017-01-22 23:25:56 -05:00
Fox-McCloud dde14aa78e it compiles 2017-01-22 19:57:03 -05:00