Fox-McCloud
390f6768b3
Merge remote-tracking branch 'upstream/master' into botany-rework
2017-02-05 05:26:46 -05:00
Crazy Lemon and GitHub
01c41cfb86
Merge pull request #6081 from Markolie/lavaland_megafauna
...
Ports Lavaland megafauna
2017-02-05 00:27:40 -08:00
Fox-McCloud
f8602ffef8
last fixes, hopefully
2017-02-04 04:28:42 -05:00
Aurorablade
1943f059c5
Requested changes
2017-02-03 23:41:04 -05:00
Aurorablade
391976f7ed
I thought i deleted you....
2017-02-03 17:14:44 -05:00
Aurorablade
37573a4339
Bugfix
2017-02-03 17:05:37 -05:00
Markolie
2b767bb9c9
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
...
# Conflicts:
# code/modules/mob/mob_helpers.dm
# icons/obj/ammo.dmi
# icons/obj/guns/projectile.dmi
# icons/obj/storage.dmi
2017-01-31 17:44:38 +01:00
Fox McCloud and GitHub
0874ea7295
Merge pull request #6152 from uraniummeltdown/windowflash
...
Window Flashing
2017-01-31 01:30:39 -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 and GitHub
e1e0824418
Merge pull request #6202 from uraniummeltdown/xenobio
...
Slime Transference Potion
2017-01-27 20:18:19 -05:00
Fox-McCloud
9fd8718bc7
Merge remote-tracking branch 'upstream/master' into botany-rework
2017-01-27 19:31:07 -05:00
FlattestGuitar
79e1953f41
Fixes a weird runtime. I think.
2017-01-28 00:48:05 +01:00
Markolie
1d7de41acb
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
...
# Conflicts:
# code/modules/pooling/pool.dm
2017-01-27 17:28:14 +01:00
Fox-McCloud
51bbe8c466
Merge remote-tracking branch 'upstream/master' into botany-rework
2017-01-26 06:53:18 -05:00
Crazy Lemon and GitHub
0e42e416b6
Merge pull request #6176 from Fox-McCloud/reagents-noreact-refactor
...
Makes Reagents Holder Process and Refactors NOREACT
2017-01-26 03:47:30 -08: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
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
7007f6bbdf
Merge remote-tracking branch 'upstream/master' into botany-rework
2017-01-23 01:01:09 -05:00
Fox-McCloud
dc0710135e
more fixes
2017-01-23 00:53:44 -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
uraniummeltdown
aa9f57b00e
slime glass reaction, slimepotions check for proximity
2017-01-21 10:52:25 +04:00
Markolie
9619b867ab
Implement Fox's changes for tinlux
2017-01-21 00:44:10 +01:00
Markolie
7bd3ede354
Lavaland food fixes
2017-01-21 00:14:09 +01:00
Markolie
a50a3d59b9
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
...
# Conflicts:
# code/__DEFINES/is_helpers.dm
# code/_globalvars/lists/objects.dm
# code/game/machinery/turrets.dm
# config/example/config.txt
# goon/browserassets/css/browserOutput.css
# icons/obj/library.dmi
# icons/turf/floors.dmi
2017-01-20 23:43:35 +01:00
Markolie
915ff13bfb
Add Lavaland reagents, fix mine lamp luminosity
2017-01-20 23:35:56 +01:00
Crazy Lemon and GitHub
37a7484976
Merge pull request #6149 from FlattestGuitar/log-upgrade
...
Adds log stacking to admin logs
2017-01-18 19:13:50 -08:00
uraniummeltdown
f7f926e1fa
adds transfer potion to xenobio rainbow core + blood, potion and reaction
2017-01-17 17:40:42 +04:00
Mieszko Jędrzejczak
1b506aaf9f
Switches over to the new system
2017-01-17 13:57:07 +01:00
Fox-McCloud
ea8080e6c9
Makes Reagents Holder Process and Refactors NOREACT
2017-01-14 20:09:49 -05:00
Fox-McCloud
56f0d79f15
Adds Species Levers
2017-01-14 03:51:43 -05:00
uraniummeltdown
11c0cb73f6
added it to defib, cloning, strange reagent
2017-01-12 19:44:18 +04:00
Fox-McCloud
8e355a867c
Fixing Food Runtime
2017-01-10 21:40:54 -05:00
Crazy Lemon and GitHub
f1c3a7cd13
Merge pull request #6085 from Fox-McCloud/food-rework
...
Food rework
2017-01-10 12:11:17 -08:00
Crazylemon64
ec0f13d41e
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub
2017-01-06 05:01:43 -08:00
Crazylemon64
f954382619
Adds a ui_key arg to ui_data
2016-12-31 12:51:07 -08:00
Aurorablade
98b7a89a17
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub
...
# Conflicts:
# code/game/machinery/doors/airlock.dm
2016-12-29 11:01:43 -05:00
Crazy Lemon and GitHub
cf2f02e2c6
Merge pull request #5985 from Fox-McCloud/wall-rot
...
Wall Rot Effect Refactor
2016-12-21 17:43:45 -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
4b1bfe33ff
Wall Rot Effect Refactor
2016-12-14 13:12:10 -05:00
Fox-McCloud
7a55ec18fc
Merge remote-tracking branch 'upstream/master' into food-rework
2016-12-05 12:40:32 -05:00
Aurorablade
fa1aa894ea
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub
2016-12-01 18:04:07 -05:00
Fox-McCloud
f53b38da3d
nutrition adjustments
2016-11-29 12:01:59 -05:00
Fox-McCloud
e134100164
Hunger Rework
2016-11-28 13:17:46 -05:00
Fox-McCloud
ed3a5252c8
Fixes Faint and Mickey Finn
2016-11-26 16:09:00 -05:00
Aurorablade
21781d7be8
Crazy lemon comments.
2016-11-22 02:22:39 -05:00
Fox-McCloud