Crazy Lemon
|
2d77a0ab4d
|
Merge pull request #6357 from Fox-McCloud/var-edit-fixes
On Varedit Fixes
|
2017-02-07 20:01:32 -08:00 |
|
Crazy Lemon
|
d11dfa7a3b
|
Merge pull request #6343 from Fox-McCloud/reagent-tank-thingy
Refactors Reagent Tanks--Adds High Capacity Water Tank
|
2017-02-07 19:58:28 -08:00 |
|
Crazy Lemon
|
685250501b
|
Merge pull request #6345 from Fox-McCloud/monkey-cube-refactor
Monkey cube refactor
|
2017-02-07 19:53:58 -08:00 |
|
Crazy Lemon
|
725ea4f3a7
|
Merge pull request #6349 from Fox-McCloud/ttv-cleanup
Tank Transfer Valve Cleanup and In-Hands
|
2017-02-07 19:51:59 -08:00 |
|
Crazy Lemon
|
23a43f141e
|
Merge pull request #6329 from uraniummeltdown/mineral
Mineral Floors
|
2017-02-07 19:33:24 -08:00 |
|
Crazy Lemon
|
7561459cb5
|
Merge pull request #6296 from KasparoVy/steal-storageimp-check
Traitor Steal Objective now Checks Storage Implants
|
2017-02-07 10:05:44 -08:00 |
|
Fox-McCloud
|
ad2468196e
|
On Varedit Fixes
|
2017-02-07 08:44:50 -05:00 |
|
uraniummeltdown
|
3e7dafe21a
|
move all floor tiles to tiles.dmi, origin_tech materials=1 for base tile object, rename tranquillite tile item state
|
2017-02-06 21:41:39 +04:00 |
|
Fox-McCloud
|
e8bc6da23a
|
Tank Transfer Valve Cleanup and In-Hands
|
2017-02-06 12:19:57 -05:00 |
|
Crazy Lemon
|
cc2eceb0a3
|
Merge pull request #6186 from Fox-McCloud/stunprod
Tweaks the Stunprod
|
2017-02-06 05:46:26 -08:00 |
|
Fox-McCloud
|
249cd3279c
|
Merge remote-tracking branch 'upstream/master' into stunprod
|
2017-02-06 05:35:59 -05:00 |
|
Fox-McCloud
|
846ce475b2
|
Refactors Reagent Tanks--Adds High Capacity Water Tank
|
2017-02-05 13:58:24 -05:00 |
|
uraniummeltdown
|
385db6d240
|
Merge remote-tracking branch 'remotes/upstream/master' into mineral
# Conflicts:
# icons/obj/items.dmi
# icons/turf/floors.dmi
|
2017-02-05 17:40:39 +04:00 |
|
Fox-McCloud
|
2c986259af
|
Fixes Iconless Banana Peels
|
2017-02-05 06:43:14 -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 |
|
uraniummeltdown
|
5f2ef0ef7d
|
mineral floors from TG
group silent tiles with mineral tiles
add tile recipes
add mineral floor tile stacks and turfs
add ability to weld mineral floor tiles
|
2017-02-05 10:46:24 +04:00 |
|
uraniummeltdown
|
7dd342743a
|
added cargo ID skin to agent ID and ID Computer
|
2017-02-05 09:19:52 +04:00 |
|
Fox-McCloud
|
f8602ffef8
|
last fixes, hopefully
|
2017-02-04 04:28:42 -05:00 |
|
Mark van Alphen
|
fe62b212b4
|
Merge branch 'master' into lavaland_megafauna
|
2017-02-02 20:17:31 +01:00 |
|
Brian McGillivray
|
23139987a0
|
Tweak: Mr Chang's vending machine now refillable
Changed the Mr Chang's vending machine to be able to be refiled with a
new Chinese vending refill canister crate that can be ordered by Cargo.
|
2017-02-02 15:49:27 +00:00 |
|
Fox McCloud
|
3d587dea5b
|
Merge pull request #6177 from uraniummeltdown/new
Cyborg Blueprints
|
2017-02-02 00:50:33 -05:00 |
|
Fox-McCloud
|
78a2518135
|
Monkey cube refactor, pre-map
|
2017-01-31 20:44:52 -05:00 |
|
Markolie
|
b55394ace3
|
Fix resource identifiers
|
2017-01-31 17:45:46 +01: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 |
|
uraniummeltdown
|
7259e4ce07
|
blueprints for engiborgs
|
2017-01-31 19:22:29 +04:00 |
|
KasparoVy
|
4a9f7f28f7
|
Traitor Steal Objective now Checks Storage Implants
Does what it says on the tin. In assessing the completion of a steal
objective, storage implants will now be checked.
|
2017-01-31 05:01:23 -05:00 |
|
Fox McCloud
|
0874ea7295
|
Merge pull request #6152 from uraniummeltdown/windowflash
Window Flashing
|
2017-01-31 01:30:39 -05:00 |
|
Fox-McCloud
|
80587202fe
|
forcemove fixes
|
2017-01-27 21:03:57 -05:00 |
|
Fox-McCloud
|
9fd8718bc7
|
Merge remote-tracking branch 'upstream/master' into botany-rework
|
2017-01-27 19:31:07 -05: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
|
6d3ef6001f
|
drying racks
|
2017-01-26 23:48:47 -05:00 |
|
Fox McCloud
|
a1ac4a9ec2
|
Merge pull request #6231 from Aurorablade/ThePowerOfSalt
THE POWER OF SALT COMPELS YOU
|
2017-01-26 10:52:44 -05:00 |
|
Aurorablade
|
55e58ef471
|
honk
|
2017-01-26 10:39:48 -05: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 |
|
Mark van Alphen
|
d55a2c4b6e
|
Merge branch 'master' into lavaland_megafauna
|
2017-01-25 18:56:09 +01:00 |
|
Crazy Lemon
|
15dca8b4aa
|
Merge pull request #6226 from Fox-McCloud/debug-this
Removes Unused Object
|
2017-01-25 04:15:18 -08:00 |
|
Aurorablade
|
29c6a89f45
|
removes processed bread
|
2017-01-24 23:24:49 -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 |
|
Aurorablade
|
318c339f11
|
icons are silly
|
2017-01-23 18:32:40 -05:00 |
|
Aurorablade
|
eb4b320676
|
fox changes
|
2017-01-23 18:31:13 -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
|
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
|
104bfab759
|
sprite and code fixes
|
2017-01-22 23:25:56 -05:00 |
|
Aurorablade
|
64b8200823
|
changes
|
2017-01-22 19:42:13 -05:00 |
|
Markolie
|
d6276ae978
|
Tiger's comments
|
2017-01-22 19:15:26 +01:00 |
|