Markolie
61daab92f2
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
...
# Conflicts:
# code/modules/mob/living/carbon/human/appearance.dm
2016-10-25 18:31:39 +02:00
Markolie
d5a6e1ac5d
More fixes
2016-10-25 18:26:33 +02:00
Markolie
dbc73875d7
Fix spells, shadow/Diona QoL improvements (HUD icons)
2016-10-25 18:11:09 +02:00
Markolie
e5c4b78f47
Add Colossus, add outdoors variable to areas and update fireball targeting
2016-10-25 04:10:52 +02:00
Markolie
5ace926e42
Added Bubblegum. Added dismemberment chance to bullets, and made changes to GPS tracking.
2016-10-25 00:50:31 +02:00
Fox McCloud and GitHub
5fb35e7b23
Merge pull request #5809 from Markolie/idchecks
...
Fix up a number of ID checks
2016-10-24 15:52:01 -04:00
Markolie
f61cfb47b9
Part three: The Hierophant. Also minor fixes for the other bosses.
2016-10-24 21:39:40 +02:00
Markolie
269ead92ea
Legion fixes, debug controller additions, turret fix
2016-10-24 03:04:37 +02:00
Markolie
52355cba9d
Added Legion megafauna, updated weather and some minor other refactors/changes.
2016-10-24 02:16:45 +02:00
Fox McCloud and GitHub
45ba4d157a
Merge pull request #5416 from KasparoVy/tail_markings_mark2
...
Marking Refactor, Adds tail markings + Alt heads + Secondary (F)Hair themes, Darkens Vulp/Taj + Unathi horns/frills, Sprite adjustments and more...
2016-10-23 19:29:54 -04:00
Markolie
2e711d1337
Lay groundwork for megafauna, and add Ashdragon.
...
Includes a refactor for gun turrets (merged into portable turrets), hostile simple_animal behaviour, spells (sounds have been added) and poi_list items.
2016-10-23 23:15:57 +02:00
Markolie
79be3ca8cf
Fix up a number of ID checks
2016-10-23 15:49:02 +02:00
TheDZD and GitHub
062a14f2af
Merge pull request #5795 from Fox-McCloud/null-rod-cleanup
...
Nullrod istype Helpers
2016-10-22 09:35:16 -04:00
Markolie
3acde653d2
Fix cult girder layer
2016-10-21 18:04:00 +02:00
Markolie
4858136ca1
Cult wall fix
2016-10-21 17:59:47 +02:00
Markolie
1a307cd8c9
Identity theft objective set fix, tank examine fix, proccall null return fix
2016-10-21 17:51:38 +02:00
Markolie
7173a8fe9f
Fix aliens double attacking, tank examining and ATM security level 0 interaction
2016-10-21 17:21:23 +02:00
Markolie
e853b66747
Minor wall deconstruction refactor
2016-10-21 17:05:49 +02:00
Markolie
87920451e8
Fix robot lockdown through console and jetpack examine
2016-10-21 17:02:16 +02:00
Fox-McCloud
1da17e6863
Nullrod istype Helpers
2016-10-19 03:09:17 -04:00
Fox McCloud and GitHub
1f4faae739
Merge pull request #5763 from Markolie/nukefinish
...
Fixes
2016-10-17 22:16:42 -04:00
Fox McCloud and GitHub
977d73740f
Merge pull request #5780 from Bone-White/master
...
Fix for issue #5768
2016-10-17 19:16:21 -04:00
Bone White
b40f37444c
Fix for issue #5768
...
Correctly un-wields defib paddles when dropping.
2016-10-16 15:36:01 +01:00
Markolie
e60e93e706
Fix light fixture frame progress bar
2016-10-15 12:47:38 +02:00
Fox McCloud and GitHub
dfde050407
Merge pull request #5644 from GeneralChaos81/Conveyors
...
Port of TGs conveyors
2016-10-11 20:27:46 -04:00
TheDZD and GitHub
568e648bfb
Merge pull request #5581 from Fox-McCloud/cloning-update
...
Cloning Update
2016-10-11 16:51:34 -04:00
Markolie
570088599e
Mecha damage fix
2016-10-11 20:36:20 +02:00
Markolie
30412c8db1
Cryo tubes no longer expel gas
2016-10-11 18:21:20 +02:00
TheDZD and GitHub
e9574ebf4a
Merge pull request #5627 from Fox-McCloud/game-mode-cleanup
...
Removes Unused Gamemodes
2016-10-10 21:00:33 -04:00
Fox McCloud and GitHub
ce04590e25
Merge pull request #5752 from Markolie/antaghud
...
AntagHUD fixes
2016-10-10 20:24:42 -04:00
TheDZD and GitHub
20078cbb48
Merge pull request #5755 from Fox-McCloud/loading-fixes
...
Fixes Dual Location Objects with Grinder and Biogenerator
2016-10-10 20:18:24 -04:00
Fox-McCloud
f7f1e493ed
Fixes Dual Location Objects with Grinder and Biogenerator
2016-10-09 14:04:52 -04:00
Fox McCloud and GitHub
b878e315f1
Merge pull request #5754 from Markolie/nukefinish
...
Better nuke disk finish checking
2016-10-09 13:57:44 -04:00
Markolie
1b3cae082e
Better nuke disk finish checking
2016-10-09 19:06:42 +02:00
Fox McCloud and GitHub
cec8e4853c
Merge pull request #5731 from LittleBigKid2000/guardian-ghosts
...
Ghosts of tossed out guardians are now respawnable
2016-10-09 12:52:52 -04:00
Markolie
8a2a9ee3b0
Fixes multiple holograms being active at the same time, fixes AI's being unable to set wanted status.
2016-10-09 18:20:20 +02:00
Markolie
514222b6d7
Fixes silicons not having their antag powers/antagHUD removed properly. Fixes traitors/abductors not having their antagHUD added at roundstart.
2016-10-09 16:36:09 +02:00
Fox McCloud and GitHub
d51834cbef
Merge pull request #5737 from Crazylemon64/maroon_fix
...
Maroon now works as intended
2016-10-02 10:51:51 -04:00
Fox McCloud and GitHub
9b1aad4cf8
Merge pull request #5716 from FlattestGuitar/snpc
...
Ckeyless humans no longer get targeted by the assasinate objective
2016-10-02 10:51:12 -04:00
Crazylemon64
a93663ac91
Maroon now works as intended
2016-10-01 22:58:16 -07:00
FlattestGuitar
503287d89a
adresses things
2016-09-30 17:10:26 +02:00
Isaac Erwin
34b0a94763
Tossed out guardians are now respawnable
2016-09-29 15:16:12 -04:00
Fox McCloud and GitHub
7c57c9ac86
Merge pull request #5715 from FlattestGuitar/paifix
...
pAIs no longer turn into debris when wiped
2016-09-29 10:37:46 -04:00
Krausus
09f0aed775
Fixes door/Move calling its parent twice
2016-09-28 13:01:48 -04:00
KasparoVy
3e653a6279
Conflict resolution.
2016-09-26 12:17:35 -04:00
Mieszko Jędrzejczak
56d56ffe7f
ckeyless humans don't get to be shot
2016-09-26 17:43:57 +02:00
Mieszko Jędrzejczak
8cef21f3fe
pais don't gib on wipe
2016-09-26 17:04:34 +02:00
KasparoVy
ffc0083098
bottlefix
2016-09-18 01:06:47 -04:00
Crazylemon64
fb291bec3f
Ports tg's associative-list research datums
2016-09-14 20:38:21 -07:00
Fox McCloud and GitHub
7155b74564
Merge pull request #5629 from Crazylemon64/data_disk_info
...
Data disks now get a nice name and description when written to
2016-09-14 20:13:11 -04:00
Markolie