Markolie
|
1d6754728b
|
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_updates
# Conflicts:
# icons/mob/head.dmi
# icons/mob/suit.dmi
# icons/obj/clothing/hats.dmi
# icons/obj/clothing/suits.dmi
|
2017-02-06 20:37:03 +01:00 |
|
Markolie
|
7a4c33bbcd
|
Add meat hook, warp cube, wisp lantern, rename flashlight variable on weapons, add layer/inventory definitions
|
2017-02-06 19:55:37 +01: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 |
|
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
|
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
|
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 |
|
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 |
|
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 |
|
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
|
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 |
|
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 |
|
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 |
|
Fox-McCloud
|
706347fd84
|
even more work
|
2017-01-22 08:11:31 -05:00 |
|
Aurorablade
|
1769672037
|
this icon was a thing....
|
2017-01-21 19:37:08 -05:00 |
|
Fox-McCloud
|
ea76990b7a
|
Botany Rework
|
2017-01-21 18:28:03 -05:00 |
|
Aurorablade
|
8f3ea0d5cb
|
blrghh
|
2017-01-21 08:50:58 -05:00 |
|
Aurorablade
|
559fcebb57
|
ferp
|
2017-01-21 08:50:30 -05:00 |
|
Aurorablade
|
0d125c20a0
|
why do i do this..
|
2017-01-21 06:17:06 -05: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 |
|
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 |
|
Mieszko Jędrzejczak
|
1b506aaf9f
|
Switches over to the new system
|
2017-01-17 13:57:07 +01:00 |
|
Fox-McCloud
|
58e73501f9
|
weight adjustment
|
2017-01-16 22:35:29 -05:00 |
|
Chakirski
|
b41009c685
|
matter_is_neither_created_nor_destroyed
|
2017-01-16 00:54:56 -06:00 |
|
Fox-McCloud
|
b31735dec4
|
Tweaks the Stunprod
|
2017-01-15 21:49:19 -05:00 |
|
Fox-McCloud
|
ea8080e6c9
|
Makes Reagents Holder Process and Refactors NOREACT
|
2017-01-14 20:09:49 -05:00 |
|
Crazylemon64
|
224f86bd64
|
Bibles can reveal runes now
|
2017-01-13 13:42:56 -08:00 |
|
uraniummeltdown
|
11c0cb73f6
|
added it to defib, cloning, strange reagent
|
2017-01-12 19:44:18 +04:00 |
|
Markolie
|
f85e8fe551
|
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
# Conflicts:
# code/modules/mob/living/carbon/human/species/station.dm
# icons/mob/screen_alert.dmi
|
2017-01-11 23:11:29 +01:00 |
|
Fox McCloud
|
68dfbf6217
|
Merge pull request #6131 from Crazylemon64/robot_module_actions
Robot module actions
|
2017-01-11 08:50:50 -05:00 |
|
Crazylemon64
|
a852d3f314
|
Fixes a garrote runtime
|
2017-01-10 18:28:40 -08:00 |
|
Crazy Lemon
|
f1c3a7cd13
|
Merge pull request #6085 from Fox-McCloud/food-rework
Food rework
|
2017-01-10 12:11:17 -08:00 |
|