Commit Graph

14383 Commits

Author SHA1 Message Date
Datraen 73ee2e5ef0 Merge pull request #1637 from Yoshax/ignorefix
Fixes ignored preferences not being saved between rounds
2016-05-12 22:03:15 -04:00
Datraen baa7840bf2 Merge pull request #1641 from Yoshax/woundfix
Fixes not being able to stop wounds from bleeding
2016-05-12 22:03:02 -04:00
Datraen 19c89532d2 Merge pull request #1627 from Yoshax/lights
Lights changes and additions
2016-05-12 21:58:52 -04:00
Datraen 32f35bcc88 Merge pull request #1638 from Anewbe/unathi_chem_changes
Unathi Chem Changes - Sledge Approved
2016-05-12 21:57:27 -04:00
Yoshax 24f7c0ca2c Fixes not being able to stop wounds from bleeding 2016-05-13 02:51:40 +01:00
Yoshax 804fc11d0a Brain damage no longer prevents implant removal surgery 2016-05-13 02:01:46 +01:00
Yoshax 75b1f53141 Comments out ignore and unignoring in character setup, properly removes ability to ignore yourself 2016-05-13 01:16:44 +01:00
Anewbe 45b888fbfb Alters Unathi biology 2016-05-12 19:08:23 -05:00
Yoshax 3e184d7982 Removes ability to ignore yourself 2016-05-13 01:04:56 +01:00
Datraen 3a666dbd7f Fixes certain compile errors with the taser, baton.
Simple code certainly needs testing, regardless of the hour.
2016-05-12 18:38:41 -04:00
Datraen 3d9435c9b3 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into Slime_Rework_3
# Conflicts:
#	icons/mob/items/lefthand.dmi
#	icons/mob/items/righthand.dmi
2016-05-12 17:24:55 -04:00
Yoshax b6848460e3 Gives Diona pay the same as Taj and Unathi 2016-05-12 22:24:40 +01:00
PsiOmegaDelta a6dd6bfa4a Ports Bay's adjustments of the faux-nanoui character setup and related 2016-05-12 18:26:24 +01:00
Datraen 3103b16489 Adds colorable headtail.
This required ear slots to inherit color for mob sprites, and this was also given to glasses.
2016-05-12 12:41:26 -04:00
Datraen 2f03df4b9b Adds Headtail Chains, Bands, Cloth by Wer6. 2016-05-12 11:45:43 -04:00
HarpyEagle 8079b34a27 Updates flashbangs and flash/flare rounds to take advantage of new lighting.
Main improvement is somewhat brighter flashes, coloured flares.
2016-05-12 16:21:39 +01:00
Neerti cb5d2db7b9 Merge pull request #1621 from Datraen/FakeNanoUI-More
Brings New Player Manifest, Load Slot into FakeNanoUI.
2016-05-12 00:39:44 -04:00
Datraen 16366b8e3d Brings New Player Manifest, Load Slot into FakeNanoUI. 2016-05-12 00:14:23 -04:00
Neerti e2862ff083 Merge pull request #1616 from Anewbe/ai_languages
AI Language tweaks
2016-05-11 22:40:18 -04:00
Datraen 761ea91a70 Changes the colors of the occupation setup tab. 2016-05-11 21:14:33 -04:00
Anewbe ea8d63e9fd Adds Siik'Maas and Schechi to AI language list 2016-05-11 18:06:57 -05:00
redstryker 8ed4698b76 I'm an idiot. Fixed problem. 2016-05-11 16:16:31 -04:00
Datraen 4456f77d75 Merge pull request #1551 from Zuhayr/master
Makes slime people more interesting and thematic.
2016-05-11 02:34:50 -04:00
Datraen 5afebdbf27 Merge pull request #1603 from Anewbe/borg_languages
Fixes borg languages
2016-05-11 02:27:58 -04:00
Datraen b6a4d7ff4c Adds slimebaton, xeno taser.
Slime attack text changed.
2016-05-11 02:18:46 -04:00
Neerti 021fc36f9f Merge pull request #1587 from Anewbe/borg_armor_boost
Borg Armor Tweak
2016-05-11 01:58:42 -04:00
Neerti 84d389a0c7 Merge pull request #1479 from Yoshax/limbfixes
Wound Changes + Fixes + Medical Changes
2016-05-11 01:53:58 -04:00
Datraen e7b563ee01 Merge pull request #1593 from VOREStation/fakenano-setup
New Player/Character Setup (Fake)NanoUI
2016-05-11 01:53:04 -04:00
Neerti b65ed00b5f Merge pull request #1415 from Hubblenaut/reinf
Reinforced Walls
2016-05-11 01:52:46 -04:00
Datraen 3fb4620199 Merge pull request #1395 from ParadoxSpace/BuffsAdminGuns
Buffs Back Pulse Rifles
2016-05-11 01:51:13 -04:00
Anewbe 4b1e5c1de5 Fixes borg languages 2016-05-08 22:58:21 -05:00
Arokha Sieyes 4f7aba8b27 Panel closes on latejoin
Sure would be nice if that panel went away when you latejoin.
2016-05-08 17:06:53 -04:00
Arokha Sieyes 5692ad76ad Removed imaginary </style> tag from previous work 2016-05-08 14:20:18 -04:00
Datraen 0031f4f065 Merge pull request #1597 from Yoshax/drinkinglasses
Gives drinking glasses a material so they have a cost in autolathe
2016-05-08 11:18:24 -04:00
Yoshax e2293f1e79 Gives drinking glasses a material so they have a cost in autolathe 2016-05-08 15:51:16 +01:00
Kelenius 1848682784 Satisfies Travis 2016-05-08 17:05:27 +03:00
Kelenius d1743bd54c Fixes broken logs 2016-05-08 14:34:03 +03:00
Arokha Sieyes 45e9b4f10a Removed earlier attempt at color 2016-05-08 03:22:33 -04:00
Arokha Sieyes b6a602ba9a New Player/Character Setup (Fake)NanoUI
While I consider Polaris' character setup screen to be mechanically better
than most others, it wasn't prettier. Well. It was a bit. But now it's
more pretty-er.

Used the fake NanoUI 'browser' datum to render the pages for the New
Player panel and the Character Setup screen.
2016-05-08 03:19:09 -04:00
Anewbe 573313c139 Adds floor tiles to Construction Module 2016-05-08 00:44:43 -05:00
Anewbe 8c6e7c2e4d Re-adds hide_on_manifest 2016-05-08 00:28:12 -05:00
Anewbe db21ab2022 Fixes another thing 2016-05-08 00:16:51 -05:00
Anewbe 034802454e Fixed a thing 2016-05-08 00:10:29 -05:00
Anewbe ac3ce2e7d1 Makes borgs more versatile 2016-05-07 23:52:03 -05:00
Datraen fe97249a79 Merge pull request #1584 from Yoshax/grabanddowners
Fixes neck-grabs forcing people to lie down, stops people resisting when weakened
2016-05-07 21:07:18 -04:00
Anewbe 8294c89dd1 Ups borg armor from 60 to 90 2016-05-07 18:00:51 -05:00
Yoshax 4708af3a2e Fixes neck-grabs forcing people to lie down, stops people resisting when weakened 2016-05-07 16:41:01 +01:00
SinTwo 64df53f568 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into clothes
Conflicts:
	icons/mob/uniform.dmi
2016-05-06 21:03:18 -04:00
Datraen 454cc25cba Merge pull request #1526 from sabiram/master
Cleans up black jumpskirt icon and genericises description
2016-05-06 20:14:50 -04:00
SinTwo 8f5dd213ed Merge branch 'master' of https://github.com/PolarisSS13/Polaris into clothes
Conflicts:
	icons/mob/uniform.dmi
	icons/obj/clothing/uniforms.dmi
2016-05-06 18:31:07 -04:00