cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-27 18:51:53 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,798 Commits 26 Branches 2 Tags
ec4add0ebfa3a02003fc6abfb801a88dfdca56e8
Commit Graph

210 Commits

Author SHA1 Message Date
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
Fox-McCloud
2e3c175bfe vitamins on hydro 2016-12-14 11:59:13 -05:00
Crazy Lemon
405fe1bb54 Merge pull request #5842 from Fox-McCloud/reagent-reorganization 
Reagent Reorganization
 2016-11-21 16:54:41 -08:00
Markolie
0db6c7cb19 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into randomfixes 
# Conflicts:
#	code/game/machinery/cryo.dm
 2016-11-10 17:56:14 +01:00
Fox-McCloud
61da53cca1 create reagents proc 2016-11-06 14:37:47 -05:00
Fox McCloud
657e1649b3 Merge pull request #5829 from Markolie/plantfix 
[s]Add cooldown to the plant analyzer print
 2016-10-30 22:42:31 -04:00
Markolie
a77b690b02 Add cooldown to the plant analyzer print 2016-10-30 16:41:17 +01:00
Crazylemon64
6a7f7394a8 Ports over the status effect unification 2016-10-23 15:45:35 -07:00
Markolie
80591de9b1 Use incapacitated() checks 2016-10-18 16:30:20 +02:00
Markolie
8bd79007ef Fix holodeck ready device and ghosts accessing tray lights 2016-10-17 17:43:03 +02:00
KasparoVy
ffc0083098 bottlefix 2016-09-18 01:06:47 -04:00
Fox McCloud
c56961f6f0 Merge pull request #5642 from Krausus/UniqueIDs 
Adds Unique Identifiers with Topic and VV Integration
 2016-09-12 15:32:20 -04:00
Jazzdoodle
a6a2aa2fda Update beekeeper_suit.dm 2016-09-09 07:24:26 -05:00
Jazzdoodle
c36b560776 Fixes the beekeeper suit and hat descriptions 
Just a minor text fix.
 2016-09-07 21:14:56 -05:00
Krausus
92405288d2 UID mass replace: src=\ref[src] 2016-09-05 23:02:10 -04:00
TheDZD
f5577b4a8f add_logs() un-fuckery 2016-08-29 17:27:56 -04:00
Fox McCloud
dbc126b9c9 Merge pull request #5535 from Crazylemon64/i_hope_you_like_giant_prs 
Fixes various bugs
 2016-08-24 00:06:38 -04:00
Crazylemon64
84b44ea41c Random seeds now have a base_name 2016-08-23 00:56:58 -07:00
Crazylemon64
ff23f932a2 Fixes some runtimes when throwing hydroponics fruit 2016-08-23 00:15:30 -07:00
Fox-McCloud
1f364c1bcf Kinetic Smasher 2016-08-17 20:31:37 -04:00
monster860
19460ff4af Makes boldnotice and danger classes be be used 2016-08-11 12:20:02 -04:00