Commit Graph

16690 Commits

Author SHA1 Message Date
EmperorJon
dd944dee8c Merge pull request #2054 from Yoshax/cocktails
Adds new non-alcoholic drinkd
2016-07-08 09:53:36 +01:00
killer653
c842c5e3b5 Fixes transformation vore types 2016-07-07 23:05:54 -04:00
SinTwo
5c4c283b80 changelog and span tags 2016-07-07 20:38:46 -04:00
Anewbe
15fb0149b3 Lets sec characters spawn with fuzzy coats 2016-07-07 19:14:31 -05:00
Yoshax
a3b1363b2c Adds new non-alcoholic drinks 2016-07-07 21:51:30 +01:00
Yoshax
1c8224fd07 Merge pull request #2028 from Anewbe/gauntlets
Hardsuit gauntlets cover gloves
2016-07-07 01:33:16 +01:00
killer653
1acb7b8094 Update 2016-07-05 23:09:47 -04:00
killer653
1bdbb1af62 Gives xenochimera hair, and also taj hairs. 2016-07-05 23:07:18 -04:00
Anewbe
644e878493 Adds To-Do list for adding gauntlets as a standalone item. 2016-07-05 22:03:19 -05:00
Neerti
8c8dbf55fd Merge pull request #2022 from Yoshax/tajaranhair
Ports some cat hair or something
2016-07-05 22:13:15 -04:00
Yoshax
5110628a4b Merge pull request #2047 from Neerti/7/5/2016_ai_core_defense
AI Core Update
2016-07-06 02:36:32 +01:00
Yoshax
f8a74aa907 Merge pull request #2046 from VOREStation/alienwhitelist
Fix inconsistency with alien whitelist
2016-07-06 02:36:26 +01:00
Anewbe
a3195bfacb Borosilicate glass alloying should no longer produce slag 2016-07-05 20:20:01 -05:00
Neerti
16426833cd Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 7/5/2016_ai_core_defense 2016-07-05 17:39:26 -04:00
Neerti
bcca19bc71 AI Core Update
Changes layout of the AI core, see picture in PR.
Moves APCs for core and upload to the backs of the rooms.
Critical APCs can somewhat resist EMP now.
Gives turrets a ten second timeout until they go underneath the turret covers, unless turned off manually or if they lose power.
Adds a new type of turret specifically for the AI upload/core.  This type has more health, has a 1/3 chance to ignore EMP, and fires xray lasers, to counter ablative armor.
A new material called Durasteel has been added.  It is made from Plasteel and diamonds, and boasts more toughness than Plasteel alone, as well as reflectivity.  The inner walls of the AI core are made out of this new material, which makes emitters less helpful.
Emitters can be damaged by projectiles, and will explode if too much damage is sustained.  Shooting a Durasteel wall will likely cause you to lose the emitter.
New AI core turrets turn green when on lethal, to show that xray is coming.
2016-07-05 17:33:34 -04:00
Arokha Sieyes
86fe574faf Fix inconsistency with alien whitelist 2016-07-05 14:48:17 -04:00
Cameron653
ae25cc1db9 Makes whitelist not be stupid for the moment 2016-07-05 13:28:16 -04:00
Mloc
7377f57e5d adds bun-bun, a bread monkey made with two burger buns
Signed-off-by: Mloc <colmohici@gmail.com>
2016-07-05 18:19:05 +01:00
Cameron653
f0a2f5e13e Unwhitelist promethean 2016-07-05 13:10:07 -04:00
Cameron653
972077ee37 Emergency bugfix 2016-07-05 13:08:31 -04:00
Yoshax
bc0b9792bc Merge pull request #2041 from VOREStation/mobspawn
Modernizes [Re]Spawn Character
2016-07-05 17:23:18 +01:00
Arokha Sieyes
71d29b0320 Added features, cancel buttons.
Added job selection, adding to manifest optionally by early-check if they were on it before.
2016-07-05 12:04:38 -04:00
Cameron653
864d23d475 Gives heavy & thunderdome armor armor values.
Gives the thunderdome armor and the heavy armor the same values as the heavy armor vest, as they had no armor at all previously.
2016-07-05 11:46:42 -04:00
Arokha Sieyes
34c6ba4604 Modernizes [Re]Spawn Character 2016-07-05 02:40:01 -04:00
Yoshax
10bc1bf21e Merge pull request #2040 from redstryker/Mask_Changes
Adds the Ability to Pull Down Sterile Masks and Wear Bandannas on Head
2016-07-05 02:19:44 +01:00
Yoshax
27c4ec5c73 Merge pull request #2038 from Woodratt/1.5.3_Trade_Ship
- Adds Serena's Trade Ship along with all the odds and ends required …
2016-07-05 02:18:28 +01:00
redstryker
1dcad7f92d Adds the Ability to Pull Down Sterile Masks and Wear Bandanas on the Head 2016-07-04 19:31:15 -04:00
SinTwo
386ceb2bc5 makes water-cooler bottles attainable through in-game means 2016-07-04 18:17:53 -04:00
woodratt
55562aeb3f - Adds Serena's Trade Ship along with all the odds and ends required to have it work properly.
- Adds a special snowflake mutt as well for ease of teleportation to the trade ship area prep area.
2016-07-04 14:07:14 -07:00
Anewbe
c145e19177 Gauntlets shouldn't eat gloves 2016-07-04 00:46:25 -05:00
Yoshax
e164f7460a Merge pull request #2034 from aztectornado/teshfix
Temporarily removes Teshari lonliness as possible bugfix
2016-07-04 04:05:28 +01:00
Patch
14dc4aef0e Temporarily removes Teshari lonliness as possible bugfix 2016-07-03 21:05:30 -05:00
Anewbe
3f3d89b08e Removes "is" from pose. 2016-07-03 19:22:39 -05:00
Spades
fc059ab4e8 Merge pull request #397 from Cameron653/master
Egg TF revamp, adds xeno egg sprite, bug fixes, reverts #382
2016-07-03 20:10:34 -04:00
Arokha Sieyes
59f6b7570a Merge pull request #398 from VOREStation/sync
Polaris Sync
2016-07-03 19:47:47 -04:00
killer653
e55d5c6900 AHHHHHHHHHHHHH 2016-07-03 19:05:55 -04:00
killer653
88acd48f16 Merge remote-tracking branch 'refs/remotes/VOREStation/master'
# Conflicts:
#	code/modules/mob/living/carbon/human/species/station/station_vr.dm
2016-07-03 19:04:53 -04:00
killer653
4822804911 Fixes conflicts 2016-07-03 19:00:55 -04:00
Spades
27e6a36836 Merge pull request #395 from JoanRisu/Fluff_Items_worshop
More banners for related universe events
2016-07-03 18:54:49 -04:00
Spades
bb8c14c69c Merge pull request #390 from VOREStation/meta-human
Add human recoloring
2016-07-03 18:54:39 -04:00
Arokha Sieyes
52b0bd25c4 Set respawn back to 60s 2016-07-03 18:15:15 -04:00
Arokha Sieyes
ec07dbbb7d Compatibility tweaks for new Polaris sync 2016-07-03 17:21:03 -04:00
Arokha Sieyes
484fb96202 Merge branch 'master' of https://github.com/PolarisSS13/Polaris
# Conflicts:
#	.travis.yml
#	code/game/machinery/adv_med.dm
#	code/modules/mob/mob.dm
2016-07-03 16:21:21 -04:00
Anewbe
f375595d30 #MoreDice2016 (#2016)
* Adds more dice

* Adds sprites, fixes some pathing
2016-07-03 19:48:28 +01:00
killer653
43a7f8bad2 Fixes the sprites not updating after TF 2016-07-03 00:08:58 -04:00
killer653
3d35b13653 Brings back the floorlength braid. 2016-07-02 22:27:10 -04:00
Anewbe
1d9e7cd95b Fixes 2016-07-02 21:25:38 -05:00
Anewbe
ab9bfb3817 Adds gauntlets, allows RIGs to be worn over gloves 2016-07-02 20:18:19 -05:00
Cameron653
13d75315bb Adds in selectable egg TF, reverts #382, a few tf fixes. 2016-07-02 20:52:07 -04:00
Spades
33c36365f6 Merge pull request #393 from Cameron653/master
Gives monkeys default language, removes neatness tabs.
2016-07-02 11:38:14 -04:00