Tigercat2000
|
c62930568e
|
~~Removes~~ Nerfs sentient AI in our code
- Added Wheatly core
|
2017-02-19 15:37:23 -08:00 |
|
Krausus
|
4754d6b4b3
|
Fixes some sounds not being cached properly
|
2017-02-17 02:37:26 -05:00 |
|
Fox McCloud
|
078fb75ff5
|
Merge pull request #6402 from Crazylemon64/phlog_ignite_fix
Phlog now consistently ignites upon application.
|
2017-02-15 08:35:45 -05:00 |
|
Aurorablade
|
a39a0f92d9
|
1.5 growht cap
|
2017-02-13 08:32:36 -05:00 |
|
Aurorablade
|
6aa7905651
|
Growth Cap
|
2017-02-13 02:54:46 -05:00 |
|
Crazylemon64
|
1d61e3501d
|
Phlog now consistently ignites upon application.
|
2017-02-11 13:48:20 -08:00 |
|
Markolie
|
3298f7edce
|
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_updates
# Conflicts:
# icons/obj/objects.dmi
|
2017-02-08 19:25:47 +01:00 |
|
Fox-McCloud
|
efb49ef18e
|
Reagent Grinder Hotfix
|
2017-02-08 03:19:50 -05:00 |
|
Markolie
|
dbe1284214
|
Adds ship in a bottle/lavaland boat, paranormal ERT spacesuits, update the sord
|
2017-02-06 01:42:32 +01:00 |
|
Fox-McCloud
|
846ce475b2
|
Refactors Reagent Tanks--Adds High Capacity Water Tank
|
2017-02-05 13:58:24 -05:00 |
|
Fox-McCloud
|
390f6768b3
|
Merge remote-tracking branch 'upstream/master' into botany-rework
|
2017-02-05 05:26:46 -05:00 |
|
Crazy Lemon
|
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
|
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
|
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
|
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
|
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
|
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 |
|