Commit Graph

4852 Commits

Author SHA1 Message Date
Crazylemon64 6d3e66f41c Polishes up the reset_view proc, which is basically
`reset_perspective` from tgstation.

Also adds various support for remote viewing lenses - like cameras not
transmitting xray vision, among other things

Recommit because we're using different compiler versions
2016-12-21 17:56:57 -08:00
TullyBurnalot 51a47b37b0 - 180 Reverse, Mines now banned from surplus 2016-12-20 10:09:38 +00:00
Aurorablade c5e6c9323b addresses mrrowl comments
still haveing shuttle load issues after first one is loaded..
2016-12-11 23:11:21 -05:00
Kyep 9de53dfd1c Adds "Min Days" option to VV->Offer Control To Ghosts 2016-12-11 03:14:16 -08:00
Fox-McCloud 7a55ec18fc Merge remote-tracking branch 'upstream/master' into food-rework 2016-12-05 12:40:32 -05:00
Aurorablade 2dc1a48f35 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DWI 2016-12-01 22:38:35 -05:00
Aurorablade fa1aa894ea Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-12-01 18:04:07 -05:00
Fox-McCloud a1b8205fdd food 2016-11-29 08:45:46 -05:00
Fox-McCloud e134100164 Hunger Rework 2016-11-28 13:17:46 -05:00
KasparoVy e06218371f Sharper character creation preview images, tails/body accessories now show up in ID photos. 2016-11-25 17:55:57 -05:00
Aurorablade 5d392b36a4 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-11-15 15:30:36 -05:00
KasparoVy fae398ae42 Replaces \blue and \red with spans, removes unnecessary SRCs and :s, Fixes Negative Cable Coil Bug 2016-11-13 18:16:37 -05:00
Markolie fec0bb3ca9 Only disable fireball if it was successfully cast 2016-11-11 21:38:45 +01:00
Aurorablade 23e392f0ef Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-10-31 22:38:14 -04:00
Fox McCloud 911fa70e1a Merge pull request #5601 from Crazylemon64/status_effect_overhaul
Ports over the status effect unification from the extreme refactor
2016-10-30 22:40:24 -04:00
Fox McCloud f67bccb444 Merge pull request #5764 from Markolie/teg2
TEG refactor
2016-10-30 19:56:26 -04:00
TheDZD eb21043b9a Merge pull request #5815 from Fox-McCloud/food-refactor
Food refactor
2016-10-28 22:37:19 -04:00
Markolie 662c04a08c Disable fireball after using it 2016-10-26 18:36:01 +02:00
Markolie 0fa43f7f41 Hopefully final magic fixes, and fixes the possessor 2016-10-25 23:32:35 +02:00
Fox-McCloud 7ca1330749 further tweaks 2016-10-25 16:46:41 -04:00
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 dbc73875d7 Fix spells, shadow/Diona QoL improvements (HUD icons) 2016-10-25 18:11:09 +02:00
Aurorablade 0a265f963c Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-10-24 22:30:16 -04: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
Markolie f61cfb47b9 Part three: The Hierophant. Also minor fixes for the other bosses. 2016-10-24 21:39:40 +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 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
Crazylemon64 6a7f7394a8 Ports over the status effect unification 2016-10-23 15:45:35 -07: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 1a307cd8c9 Identity theft objective set fix, tank examine fix, proccall null return fix 2016-10-21 17:51:38 +02:00
Aurorablade 01f4e64f12 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DWI 2016-10-12 20:37:09 -04:00
Aurorablade 78eb685ac6 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-10-12 20:25:48 -04:00
Markolie c4f7730764 Additional TEG changes 2016-10-12 14:00:02 +02:00
Fox McCloud dfde050407 Merge pull request #5644 from GeneralChaos81/Conveyors
Port of TGs conveyors
2016-10-11 20:27:46 -04:00
Markolie a577cd206c TEG refactor 2016-10-11 22:49:51 +02:00
TheDZD 0b227c3d5b Merge pull request #5646 from Fox-McCloud/grenade-tweak
Atmos Grenade Balance
2016-10-10 20:54:23 -04:00
Mieszko Jędrzejczak a64f1849c0 Actually fixes the implants this time 2016-10-10 12:51:56 +02:00
Fox McCloud 230ec7603d Merge pull request #5750 from FlattestGuitar/nukiefix
Fixes nukie cyberimplants being free
2016-10-09 12:31:14 -04:00
Aurorablade e2ce799aa1 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-10-08 22:21:48 -04:00
Aurorablade 864a9ba612 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DWI 2016-10-07 23:51:48 -04:00
FlattestGuitar 7592c65fe0 ❄️ ❄️ ❄️ ❄️ ❄️ ❄️ ❄️ ❄️ ❄️ 2016-10-07 20:13:24 +02:00
Fox McCloud 3201ea3ccb Merge pull request #5738 from FlattestGuitar/fix
adds logs to missionary stuffs
2016-10-04 08:36:16 -04:00
FlattestGuitar 03cc776d40 moves the stuffs to mind.dm 2016-10-04 13:58:30 +02:00
Fox McCloud 26fe47faa7 Merge pull request #5638 from theColdflame/10mmuplink
Adds 10mm variants to the syndicate uplink.
2016-10-02 10:48:32 -04:00
KasparoVy 3e653a6279 Conflict resolution. 2016-09-26 12:17:35 -04:00
theColdflame bd73e58d60 description 2016-09-26 04:43:10 +01:00
Aurorablade dee83ef62e ALL HAIL LEMONS 2016-09-22 02:00:04 -04:00
Aurorablade 2b19b81b99 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DWI 2016-09-17 01:38:02 -04:00
Aurorablade fd9d6d8c71 ui stuff then map conflicts 2016-09-16 00:45:37 -04:00