Commit Graph

16690 Commits

Author SHA1 Message Date
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
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
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
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
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
006197dbc6 Merge pull request #2603 from Yoshax/minorbugfixboogalo
Some bugfixes
2016-10-06 22:38:32 -05:00
Anewbe
673e75832a Merge pull request #2602 from SpadesNeil/death-to-the-administrator
Replaces Station Administrator with Colony Director, NASA Approved
2016-10-06 22:31:14 -05:00
Yoshax
760d5c3b54 Fixes #2258 2016-10-07 04:30:29 +01:00
Yoshax
8c02e93b03 Fixes #2587 2016-10-07 03:58:16 +01:00
Spades
2330968176 Replaces Station Administrator 2016-10-06 22:38:02 -04:00
Anewbe
1a442aa7cc Merge things 2016-10-06 21:37:10 -05:00
Anewbe
0f51fda83a Energy weapons can be reloaded 2016-10-06 21:30:52 -05:00
Anewbe
7e79d9b5f8 Merge pull request #2596 from Neerti/10/5/2016_event_system
Cleans Up WIP Event System + New Grid Check For It
2016-10-06 20:45:55 -05:00
Neerti
4131c1f8fa Adds Log Verbs for Moderators
Adds the log retrieval verbs for moderators.
2016-10-06 17:42:40 -04:00
Neerti
337ef499a1 Cleans Up WIP Event System + New Grid Check For It
Separates the 'count and assess everything' stuff to it's own datum, called the metric datum, which I plan to add on to in the future to make counting and metrics easier.
Makes decision process a bit more weight-based, will probably continue tweaking later.
Makes the admin debug UI have links to change settings easily.
Adds replacement for grid check event, which works similar to the old one, but is now based on a physical machine in the game world, that Engineering can hack to make the event end faster, if so desired.  Note that the machine is not mapped in, and won't be mapped in until the event system is ready for launch.
Adds grid_check variables to SMESes and APCs to make them stop doing work without draining the battery.
Grid checks in the new system are caused by a "power spike" which originates from the engine and will cause bad things, should no grid checker machine be connected to the power-net.  These power spikes occur when the GM decides that a grid check is a good event to have.
The grid checker can be built and deconstructed using the standard machine construction methods.
2016-10-05 21:40:07 -04:00
Anewbe
2f5f9b5c78 Fireaxes no longer embed every hit 2016-10-05 18:00:57 -05:00
Eearslya Sleiarion
2e5f80175c Prevent attacking vore mobs from within them (#627) 2016-10-05 12:50:04 -04:00
Neerti
01328c5a03 Merge pull request #2594 from redstryker/Let'sStartARiot
Crowd Control Voidsuits and Bugfix
2016-10-04 21:43:29 -04:00
Anewbe
7bef4447cd Merge pull request #2593 from Neerti/10/4/2016_technomancer_changes
Technomancer Bug Fixes & Tweaks
2016-10-04 20:30:01 -05:00
redstryker
1f3a601075 Crowd Control Voidsuits and Bugfix 2016-10-04 21:19:58 -04:00
Neerti
0d140349b3 Technomancer Bug Fixes & Tweaks
Cores can now be locked and unlocked by a verb.  Locked cores cannot be removed by anyone.  Cores automatically unlock if the wearer dies or otherwise stops existing for some reason.
Healing spells now induce a flat instability cost on the healer instead of it being split between healer and healed.  The amount healed is greatly increased if used on someone besides the healer.
Mend Organs is now called Great Mend Wounds, and now heals broken bones, IB, eye damage, and blood loss in addition to internal organs.
Radiating instability (the purple glow) now gives a warning to people afflicted.
Instability discounts should start applying correctly for specific cores.
Instability now affects all living mobs and not just humans.  This includes borgs and simple animals.
Phase shift now adds ongoing instability while hiding inside the rift.
Projectile spells should be logged now.
Wards last forever, and should not die in vacuum now.
Restoration aura is now green colored and not blue.
Simple mobs and cyborgs are now harmed by lightning.
2016-10-04 21:09:15 -04:00
woodratt
d5b79a7d7b Edits to the radiation hood sprite
Adds "flags_inv = BLOCKHAIR" to the file for the radiation hood so ponytails and other hair doesn't clip through.

Adjusts the sprite of the hood as well to help hide the fact the hair is missing underneath the faceplate.
2016-10-04 14:34:24 -07:00
Anewbe
5d8ac049f7 Merge pull request #2585 from redstryker/MedicalIsStartingABand
Medic Band
2016-10-04 14:52:35 -05:00
redstryker
d6f7d0a007 Medic Band 2016-10-04 07:56:14 -04:00
Eearslya Sleiarion
b1b0f28938 Allow cyborg combat module in code red (#577)
* Allow cyborg combat module in code red

* Tweaks to combat module for balance purposes
2016-10-04 02:59:07 -04:00
Neerti
2157d42c0d Fixes runtime on embedding
Turns out heads can't be compared to numbers on their own.
2016-10-03 21:13:49 -04:00
Neerti
fd62cbe006 Merge pull request #2560 from Anewbe/alien_metabolism
Adds code to make species level metabolism rates possible.
2016-10-03 18:10:25 -04:00
Anewbe
6c4703f742 Merge pull request #2529 from redstryker/BoneSoundV2
Bone Sound V2
2016-10-03 17:08:38 -05:00
Anewbe
29141f9606 Merge pull request #2528 from SpadesNeil/heavy-armor-suit
Heavy Armor values reworked for FUN™
2016-10-03 16:53:49 -05:00
JoanRisu
348ec23b40 Clothes edit 2016-10-02 18:08:11 -07:00
Anewbe
9aa5faa181 Merge pull request #2573 from Neerti/10/2/2016_cracks
Adds Asteroid Cracks
2016-10-02 14:43:06 -05:00