Commit Graph

24703 Commits

Author SHA1 Message Date
Arokha Sieyes
00405946a4 Adds KH life crystal fluff/loadout item
It just exists as a fluff excuse as to how you get cloned offsite if you don't get cloned at CC, if you want an alternative. The little lore behind it is that it notifies an offsite agency if you die so you can get cloned by them. It has a little paper in the carrying case explaining that.

It's a uniform accessory, or you can just pocket it. They are unmarked, so finding a broken one shouldn't be very interesting evidence or influence much outside just the fluff idea of their existence.

(Also, it's a crystal, but no it's not magic. The manual goes into detail about the power source, transmitter, etc.)
2016-10-14 01:52:28 -04:00
MagmaRam
c10b145782 Made bleeding from staunched wounds dynamic
yoshax did the thing etc
2016-10-13 22:36:00 -05:00
Neerti
72715b40d8 Merge pull request #2638 from Anewbe/track_spell
Fixes the bug where the Track spell doesn't go away when dropped
2016-10-13 22:29:27 -04:00
Anewbe
01b4c80ce4 Fixes Track spell 2016-10-13 18:27:28 -05:00
Anewbe
7a26fa94e3 Fixes the world >> "no sound" issue 2016-10-13 18:06:42 -05:00
Spades
ab9c5fc67e Merge pull request #642 from Eearslya/fix306-blank-items-hotfix
Hotfix for blank items in bellies
2016-10-13 15:40:06 -04:00
Spades
6d59ebc548 Merge pull request #638 from Cameron653/master
Adds taur specific voidsuits to areas
2016-10-13 15:39:53 -04:00
Spades
c20e79509a Merge pull request #648 from Dhaeleena/kiiteh_Titteh
Adds Female tajara sprite back to the game.
2016-10-13 15:38:49 -04:00
Dhaeleena
c5fe33dcdb This adds the Deform sprites for the new female tajaran torso (Clone damage) 2016-10-13 09:32:40 -03:00
Anewbe
0def0f6789 Flashlight fixes 2016-10-12 23:20:19 -05:00
MagmaRam
b141a993de More tweaks that Yoshax should get credit for 2016-10-12 22:02:56 -05:00
MagmaRam
45d1dcc966 Merge branch 'bloodloss' of https://github.com/MagmaRam/polaris 2016-10-12 22:00:33 -05:00
Dhaeleena
a9f331842e Adds Female tajara sprite back to the game. Resolves Issue #629 Thank DeepIndigo for the sprites. 2016-10-12 23:16:18 -03:00
Neerti
955b5d1525 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 10/12/2016_overload_correction 2016-10-12 19:28:51 -04:00
Neerti
9404ad98fd Overload Description Correction
Overload should correctly state how much damage it does, which is 0.3% of current charge, or 0.4% with the scepter of enhancement.
2016-10-12 19:26:39 -04:00
MagmaRam
38a037edb3 Optimization tweak, credit to Yoshax 2016-10-12 15:59:18 -05:00
MagmaRam
bdf3dde514 Readd bleeding from open surgery stages. 2016-10-12 07:28:22 -05:00
MagmaRam
0fd5631c27 Bloodloss now depends on wound type and limb 2016-10-12 07:20:35 -05:00
MagmaRam
59d2608fbb Bruises now bleed at a much higher damage threshold. 2016-10-11 22:28:57 -05:00
Anewbe
5bfc0c851e Changes the way embedding works 2016-10-11 21:29:49 -05:00
Dhaeleena
b9bded2132 Adds Synthetic Zeng-Hu brand Tajaran tail as a custom tail. 2016-10-11 15:28:48 -03:00
Dhaeleena
266daf39b8 Added Tajaran alternate head for Zeng-Hu synth manufacturer 2016-10-11 13:47:01 -03:00
Eearslya
66342af864 Fix solar assembly behavior while in inventory 2016-10-10 03:03:48 -07:00
Eearslya
1d9954e3cf Prevent pseudo-item-duplication in bellies 2016-10-10 02:03:49 -07:00
Eearslya
0d4686bdbd Hotfix for blank belly items
Fixes #306 (sorta)
2016-10-10 02:03:37 -07:00
Cameron653
28daa366f4 Totally a typo fix and not a way to get around travis 2016-10-09 21:55:32 -04:00
Yoshax
b9e871bf5b Quick flashlight fix 2016-10-10 02:27:58 +01:00
killer653
be9e332e9f Fixes descriptions 2016-10-09 21:14:51 -04:00
Spades
3593e07f0b Symbol fix (#637)
[REDACTED]
2016-10-09 20:05:49 -04:00
Spades
570c2474c3 Fixes w_class of items to be consistent with Polaris update (#636)
* Fixes w_class of items to be consistent with Polaris update

* Typo
2016-10-09 19:23:10 -04:00
Eearslya Sleiarion
868413c880 Polaris Sync October 9th (#633) 2016-10-09 18:55:29 -04:00
Spades
05869b0d9b Zoo.dmm added, Vault updated, various bugfixes (#634)
* :(

* Ports https://github.com/PolarisSS13/Polaris/pull/2571 early.

Need this for a map I wanna do.

* need sleep

* Emergency meds added

Resolves https://github.com/VOREStation/VOREStation/issues/600

* Fixes Fax Machine showing Sif Government

* Updates Tajaran lore to match Polaris.

* Sleeping for tonight

* Fixes #623

* Added more to the map

* Fox sprites from Paradise added

* Vore bee added

* Technical stuff no one cares about.

* Another update

* Reverts Pull #508

https://github.com/VOREStation/VOREStation/pull/508 messed up digesting
dead mobs and mice.

* Sergaling are now Saru.

* Saru

* Zoo map update, near completion

* Zoo map finished, plus Station Vault updated

* Revert "Ports https://github.com/PolarisSS13/Polaris/pull/2571 early."

This reverts commit 59e2bb211759604a95319ce6b1c74219a4b60800.

* Buzz off, Travis.

* Removed microwaves entirely so Travis stops bitching

* Travis stop being dumb

* Fix the zoo map once and for all..?

* Removes backup files.
2016-10-09 18:55:17 -04:00
redstryker
dbe19bdbd3 Emergency Medical Response Voidsuit 2016-10-09 14:55:53 -04:00
Neerti
32f87cac86 Merge pull request #2617 from Anewbe/cryo_batteries
Cryopods no longer eat the cells/ammo from weapons
2016-10-09 13:25:03 -04:00
Neerti
2e5c127ac8 Merge pull request #2616 from Anewbe/low_emp
Fixes low-yield EMP grenades
2016-10-09 13:24:56 -04:00
Neerti
46bade4426 Merge pull request #2615 from Anewbe/batteries_again
Batteries again
2016-10-09 13:24:51 -04:00
Anewbe
bfb6857a26 Gives Chain Lightning an icon 2016-10-08 20:28:41 -05:00
Anewbe
7cf2373da8 Cryopods no longer eat the cells/ammo from weapons 2016-10-08 19:51:39 -05:00
Anewbe
dacbca746c Fixes low-yield EMP grenades 2016-10-08 19:38:49 -05:00
Anewbe
771d8b9e4b Adds a smaller device cell for use in non-weapon devices 2016-10-08 15:34:18 -05:00
Anewbe
9ff32b5914 Weapon Cell Oversight fixes 2016-10-07 21:48:21 -05:00
Anewbe
f4aeb10fdc Merge pull request #2606 from Yoshax/flashlights
Makes flashlights use cells
2016-10-07 21:26:13 -05:00
Yoshax
5fc4c4b889 Removes cell randomization and ensures slime flashlight things arent weird 2016-10-08 03:18:48 +01:00
Neerti
5a72ab5f48 Revert "Revert "Revert "Revert "Revert "Revert "Adds hub passwordu"""""" 2016-10-07 21:15:43 -04:00
Anewbe
5febffea2f Merge pull request #2590 from SpadesNeil/jukebox-v2
Jukebox Hacking. Again. Now with 100% less copyrights.
2016-10-07 17:18:24 -05:00
Yoshax
24953efe7a Fixes some issues 2016-10-07 18:00:48 +01:00
Yoshax
087b9072e0 Adds changelog 2016-10-07 16:15:25 +01:00
Yoshax
a723eb3732 Makes flashlights use cells 2016-10-07 15:59:24 +01:00
redstryker
2331487ac0 Overseer Alt Title 2016-10-07 00:05:34 -04:00
Spades
85e3f0e40e Merge remote-tracking branch 'refs/remotes/PolarisSS13/master' into jukebox-v2
# Conflicts:
#	polaris.dme
2016-10-06 23:54:45 -04:00