Commit Graph

22991 Commits

Author SHA1 Message Date
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
Yoshax
fa8bb179bf Fixes #1586 2016-05-11 17:17:43 +01: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
cb08c07cf2 Merge pull request #1602 from redstryker/master
Adds Glowsticks
2016-05-11 02:00:51 -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
861c9d7fdc Merge pull request #1560 from Yoshax/emagupgrade
Adds the ability to feed telecrystals to emags for more uses
2016-05-11 01:55:12 -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
Neerti
3dd6afe8af Merge pull request #1604 from silveryferret/no_roundstart_report
Removes the "Subversive Elements" Cent. Com. report at roundstart
2016-05-11 01:41:20 -04:00
EmperorJon
d869a52c4e Merge pull request #1599 from Yoshax/mercitemfixes
Removes antag limitations on uplink items to make them actually buyable
2016-05-09 15:52:39 +01:00
silveryferret
a9c65176dd Removes the "Subversive Elements" Cent. Com. report
As title.
2016-05-09 09:45:53 -05:00
Datraen
c192d9551f Merge pull request #1568 from Yoshax/doublechance
Adds the ability for vending machines to vend 2 items with a 1% chance
2016-05-09 08:39:03 -04:00
Anewbe
4b1e5c1de5 Fixes borg languages 2016-05-08 22:58:21 -05:00
redstryker
8b5ed3d7ff Adds Glowsticks 2016-05-08 18:22:15 -04: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
Yoshax
79b1bf5260 Removes antag limitations on uplink items to make them actually buyable 2016-05-08 22:03:17 +01:00
Arokha Sieyes
5692ad76ad Removed imaginary </style> tag from previous work 2016-05-08 14:20:18 -04:00
Datraen
d476cac4f0 Merge pull request #1598 from Yoshax/gamemodesecretcosts
Swaps secret player count for ninja/wizard and ninja&wizard
2016-05-08 11:21:10 -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
f9708a2e0e Swaps secret player count for ninja/wizard and ninja&wizard 2016-05-08 16:05:07 +01: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
Yoshax
30bcf94067 Removes for loop and adjusts code 2016-05-08 12:41:38 +01: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
EmperorJon
8af283c7a3 Merge pull request #1569 from Mark9013100/5/6/2016camera_edits
Security Camera edits
2016-05-07 00:35:36 +01:00
EmperorJon
e67e2caa48 Merge pull request #1577 from redstryker/master
Changes all references to 'Mars University' from 'Mars University' to 'Mojave University'
2016-05-07 00:35:10 +01:00
Datraen
5cc027aacf Merge pull request #1536 from Yoshax/roboticsandcells
Remaps robotics and mechbay slightly, other adjusts and adjusts cell charge rate
2016-05-06 18:46:53 -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
redstryker
ff361c2023 Changes all references to 'Mars University' to 'Mojave University' 2016-05-06 18:23:40 -04:00
SinTwo
5e4ca22080 Adds skirts by JakkSergal, cleans up skirts, simplify skirts on loadout. 2016-05-06 18:17:19 -04:00
Yoshax
52d73dbf80 Makes drinking glasses produceable in autolathes 2016-05-06 22:51:18 +01:00