KasparoVy
ef5376ede2
conflict resolution
2017-02-05 17:13:34 -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
99cbcbfbf5
pre-emptive cut-down of conflicts.
2017-02-05 03:18:49 -05:00
Fox-McCloud
ccd9d9596d
fungus among us
2017-02-04 05:01:03 -05: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
Mark van Alphen
fe62b212b4
Merge branch 'master' into lavaland_megafauna
2017-02-02 20:17:31 +01:00
Fox McCloud
3d587dea5b
Merge pull request #6177 from uraniummeltdown/new
...
Cyborg Blueprints
2017-02-02 00:50:33 -05:00
Fox-McCloud
ed4ae3dd8f
irrigation and missing sprites
2017-02-02 00:32:52 -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
uraniummeltdown
7259e4ce07
blueprints for engiborgs
2017-01-31 19:22:29 +04:00
Fox-McCloud
0415e5ab3a
consistency
2017-01-31 01:39:38 -05:00
Fox McCloud
0874ea7295
Merge pull request #6152 from uraniummeltdown/windowflash
...
Window Flashing
2017-01-31 01:30:39 -05:00
Fox McCloud
c9b4a951ae
Merge pull request #6178 from FalseIncarnate/NTPS
...
NTPS: Requests Console Based Shipping
2017-01-31 01:26:21 -05:00
Crazy Lemon
d76df747c5
Merge pull request #6272 from Markolie/fixxxxx
...
Give brains Galactic Common language
2017-01-30 22:02:34 -08:00
Crazy Lemon
dcc3df2118
Merge pull request #6278 from tigercat2000/saycodefix
...
Add slot_collar, remove simple_animal add_inv/remove_inv
2017-01-30 22:01:27 -08:00
Crazy Lemon
e7e22f5dff
Merge pull request #6273 from Kyep/names_fix
...
Fixes some mobs being invisible in Check_antagonists
2017-01-30 21:59:33 -08:00
Crazy Lemon
154e08bf10
Merge pull request #6282 from Kyep/ca_initial_xenos
...
Fixes initial Xenomorphs not appearing in Check Antagonists
2017-01-30 21:56:09 -08:00
Fox McCloud
0283e75fe5
Merge pull request #6254 from FlattestGuitar/erifle
...
Adds a laser carbine!
2017-01-31 00:43:15 -05:00
Fox McCloud
4842d77882
Merge pull request #6239 from Ar3nn/cluwnescanbreathetoo
...
Cluwne Mask now allows internals usage
2017-01-30 23:46:42 -05:00
Fox-McCloud
ab6fffa4dc
Removes Oudated GC Info
2017-01-30 03:01:29 -05:00
Fox-McCloud
36dae0bfb5
botany gene disks in R&D
2017-01-30 01:55:30 -05:00
Kyep
6d6eec5934
Fixes initial Xenomorphs not appearing in Check Antagonists
2017-01-29 18:48:51 -08:00
Tigercat2000
4e56bb9636
Add slot_collar, remove simple_animal add_inv/remove_inv
...
This is being done to remove the simple_animal/Topic() override.
2017-01-29 13:26:54 -08:00
Fox-McCloud
6d4316264a
plant analyzer QoL
2017-01-29 03:37:22 -05:00
Kyep
46f409ddfb
Fixes some mobs being invisible in Check_antagonists
2017-01-28 15:25:20 -08:00
Markolie
d65cc380fa
Give brains Galactic Common language
2017-01-29 00:06:00 +01:00
Fox-McCloud
fd63808e6c
supply shuttle re-addition
2017-01-28 12:56:20 -05:00
Fox-McCloud
7f2e71b0df
GC fixes and explosive vine fix
2017-01-28 11:06:42 -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
Crazy Lemon
d7ae5c4a7e
Merge pull request #6266 from Fox-McCloud/pill-fix
...
Fixes Dental Pill being an internal organ
2017-01-28 01:40:26 -08:00
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
KasparoVy
8be2693798
Minor Tweaks & Fixes
...
- Updated the flashlight eye-shine check with the new get_dark_view()
helper proc
- Removed a useless check on the handle_dna() for monkeys
- Increases reliability of the monkeyize() proc and fixes issues where
calling it wouldn't turn a mob into a monkey on the spot.
- Increases readability/maintainability of the get_colourmatrix() and
get_dark_view() procs.
2017-01-28 00:36:37 -05:00
Fox-McCloud
80587202fe
forcemove fixes
2017-01-27 21:03:57 -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
6fb69e272c
Merge remote-tracking branch 'upstream/master' into botany-rework
2017-01-27 20:15:25 -05:00
Fox-McCloud
b24be686d0
Fixes Dental Pill being an internal organ
2017-01-27 20:02:06 -05:00
Crazy Lemon
04d1b30a7b
Merge pull request #6199 from Fox-McCloud/stun-gloves
...
Adds in Stun Gloves
2017-01-27 16:57:13 -08:00
Fox-McCloud
9fd8718bc7
Merge remote-tracking branch 'upstream/master' into botany-rework
2017-01-27 19:31:07 -05:00
Fox-McCloud
9b56e9ac70
fixes and forgotten botany belt
2017-01-27 19:28:00 -05:00
FlattestGuitar
79e1953f41
Fixes a weird runtime. I think.
2017-01-28 00:48:05 +01:00
Markolie
a653732219
Sound fixes
2017-01-27 17:47:56 +01:00
Markolie
ab4703623c
Review changes
2017-01-27 17:46:38 +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
6d3ef6001f
drying racks
2017-01-26 23:48:47 -05:00
