cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-31 12:41:46 +00:00
Code Issues Packages Projects Releases Wiki Activity
32,558 Commits 26 Branches 2 Tags
3a5ef1baea9bc252a6ea4e4e8e7a3ce862f8a4bc
Commit Graph

230 Commits

Author SHA1 Message Date
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 Hassell
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 Lemon
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
Fox-McCloud
706347fd84 even more work 2017-01-22 08:11:31 -05:00
FalseIncarnate
be7f7cea37 Allows shovels/spades to remove soil patches 
Using a spade (or shovel from mining) on a patch of soil will do one of
two things:
- If there is a plant currently planted in the soil, it will remove it,
freeing up the soil patch.
- If there is no plant present, it will clear away the soil, deleting
the soil patch.

🆑
rscadd: Returns the ability to remove vacant soil with shovels and
spades, and adds the ability to dig up plants in soil to remove them
instantly.
/🆑
 2017-01-22 03:24:52 -05:00
Fox-McCloud
10c0e734c3 more work 2017-01-22 01:46:48 -05:00
Fox-McCloud
ea76990b7a Botany Rework 2017-01-21 18:28:03 -05:00
Mieszko Jędrzejczak
1b506aaf9f Switches over to the new system 2017-01-17 13:57:07 +01:00
Crazy Lemon
f1c3a7cd13 Merge pull request #6085 from Fox-McCloud/food-rework 
Food rework
 2017-01-10 12:11:17 -08:00
Crazylemon64
f954382619 Adds a ui_key arg to ui_data 2016-12-31 12:51:07 -08:00
Crazylemon64
cc697715b9 Fixes a plant splicing runtime 
Plants no longer runtime when splicing a potency-scaling reagent onto a
non-scaling reagent (grass onto poisonberries)
 2016-12-30 01:04:59 -08:00
Tigercat2000
b9abce843d NanoUI Update: Seperate UI Data into ui_data() proc 
This commit changes how NanoUI's live data updating system works.
Previously, data for the template was directly gathered in the
ui_interact proc. Now, it is seperated into the proc `ui_data`.

To players, this does absolutely nothing.
To coders, this opens up the potential for a much more complicated and
fancy graphical updating system in the future, because the data is
available on-demand without ever having to call
nanomanager.try_update_ui.
 2016-12-14 13:37:34 -08:00