Commit Graph

13098 Commits

Author SHA1 Message Date
Neerti
55162bb099 Fixes Borg Lighting Conflicts
Borg lights should be functional again.
Being on fire now makes you glow orange instead of white.  Intensity scales based on fire stacks.
2017-09-15 21:21:27 -04:00
Anewbe
377e8f15c3 Merge pull request #3838 from Cameron653/master
Removes a comment
2017-09-15 17:52:11 -05:00
Cameron653
2207d55e84 owo whats this 2017-09-15 18:43:43 -04:00
Belsima
fb0e4d3cf9 General uniform updates. (#3814)
* General uniform update.

* Maps in bathrobe.

* Revert "Maps in bathrobe."

This reverts commit 9cbe47671da7a452cb5ac040aeefdcb98dbe180a.

* Fixes cheongsams and maps in the bath robe.

* Removes unintentionally added sprite.

* Assorted bugfixes.
2017-09-15 17:14:20 -05:00
Anewbe
0af010fd4b Merge pull request #3820 from Cameron653/MEDICAL_TAPE
Adds medical tape
2017-09-14 13:16:42 -05:00
Anewbe
331c688b71 Merge pull request #3816 from Neerti/9/11/2017_instability_tweaks
Tweaks instability
2017-09-12 18:19:52 -04:00
Cameron653
79c5018dfa Adds medical tape to paramedic and CMO locker 2017-09-12 14:54:06 -04:00
Cameron653
d27e0092da Adds the medical tape item 2017-09-12 14:52:38 -04:00
Neerti
e7d89af8dd Removes Anti-Bird mechanisms from Defibs
For some reason, small mobs, which include Teshari and Prometheans (and monkeys) cannot use the defib unit.  They can wear the unit but can't actually 'hold' the paddles in both hands, which seems a bit inconsistent and I'd rather just remove the 'no birds allowed' code.
2017-09-11 18:42:18 -04:00
Anewbe
605fd11705 Merge pull request #3807 from Cyantime/weldtank
Fixes lit welders not igniting fuel tanks.
2017-09-11 17:23:44 -04:00
Anewbe
096159ac37 Merge pull request #3796 from ghost/hephaestus
Standardizes spellings to wiki and adds more major corps and places to setup.
2017-09-11 17:19:55 -04:00
Anewbe
ffb2279c37 Merge pull request #3783 from ghost/statusdisplay
Adds three new status displays for the AI.
2017-09-11 17:18:51 -04:00
Anewbe
6ffebcef6e Merge pull request #3775 from Neerti/9/8/2017_tg_maploader_port
Port's TG's Maploader
2017-09-11 17:17:23 -04:00
Neerti
f338c38b70 Removes negative from minimum instability removal 2017-09-11 12:03:49 -04:00
Neerti
bb7be9b628 Tweaks instability
Instability should now feel more responsive and less sluggish to go away.  Instead of it being removed at a semi-random and slow rate, it now has a semi-defined half life of about 46 seconds (IE 100 instability will be around 50 in 46 seconds).  The radiate pulse now occurs every Life() tick as well, and by extension the light radius update, so you should be able to see your purple halo adjust faster.

This unfortunately necessitated tweaking to the strength of instability events.  Instability events should happen more often to compensate for it going away faster.  It may need to be tweaked further.

Instability Glow (IE radiating) now radiates the instability decayed in the Life() tick instead of a third of the current instability.  This means people have more time to get out of the purple light before they start glowing themselves.  Two glowing people tend to equalize their instability if adjacent for awhile, while a third person can cause runaway instability, as normal.

Glowing now starts at 10 instability instead of 30.

Technomancer cores show the instability delta in their stat panel.

Message for standing in purple made bigger and purple-er.

Fixes bug with certain spells which waited for the effect to go off before qdeling the hand item.

Fixes leftover Xenobio tests in example map defines.
2017-09-11 11:46:35 -04:00
Anewbe
9a1d66ede2 Merge pull request #3795 from ghost/puddlefix
Fixes some descriptions.
2017-09-10 20:41:14 -04:00
Anewbe
8ea5455e3f Merge pull request #3788 from ghost/cleanmicrowave
Lets you use soap to clean microwaves.
2017-09-10 20:40:14 -04:00
Neerti
3909524289 Merge pull request #3812 from Cyantime/delay
Adds a short delay between plushie messages.
2017-09-10 20:13:59 -04:00
Anewbe
42e8bb6284 Merge pull request #3767 from Neerti/8/10/2017_make_xenobio_old_again
Make Xenobiology Old(ish) Again
2017-09-10 17:12:38 -04:00
Cyantime
61ff20a4da Adds a short delay between plushie messages. 2017-09-10 14:16:07 -04:00
Neerti
90c0193daf Fixes missing period. 2017-09-10 00:12:54 -04:00
Belsima
7359c6f7a6 Fixes up the PR. 2017-09-09 23:17:41 -04:00
Anewbe
a40fb8256d Merge pull request #3771 from Cyantime/passivevents
Makes passive vents constructable
2017-09-09 17:48:12 -04:00
Cyantime
26b53c0ea8 Fixes lit welders not igniting fuel tanks. 2017-09-09 17:25:37 -04:00
Spades
72c249f0ef Weapon sound improvements from TG, take 2 (#3772)
* Sound Improvements

Ported some sounds from TG. I was getting sick of the current pistol
sound. Didn't sound meaty enough so I changed it.

I also didn't like the default gun firing sound so I changed that too.

I also brought in a couple more sound files from TG just in case those
ever get used. No use for them currently.

While I was at it, I fixed the incorrect naming of some sound files in
audible_deception.dm for Technomancers because I was editing the file
anyway and a separate PR would make conflicts.

* I forgot to press save on this one

I tend to do that a lot

* Laser sound too.

* Adds back commented out code because reasons
2017-09-09 15:40:26 -04:00
Belsima
dc99c2bb5d Adds heart display. 2017-09-09 12:27:30 -04:00
Belsima
022eb8cf4c Standardizes spellings to wiki and adds more major corps and places to setup. 2017-09-09 12:20:08 -04:00
Belsima
960e535081 Fixes some descriptions. 2017-09-08 23:09:05 -04:00
Belsima
9a42b0af18 travis please leave me alone 2017-09-08 18:36:14 -04:00
Belsima
9ad92bf83e Lets you use soap to clean microwaves. 2017-09-08 18:20:47 -04:00
Belsima
381424b81a Adds two new status displays for the AI. 2017-09-08 17:10:33 -04:00
Anewbe
84fa9cf785 Merge pull request #3770 from Mechoid/Xeno_Tyranny_Electric_Boogaloo
Xenomorph Tweaks/Buffs.
2017-09-08 16:19:22 -04:00
Neerti
1bc28c07c0 Port's TG's Maploader 2017-09-08 12:49:26 -04:00
Woodratt
07a503a05a SC Map Changes 972017
- Added files, cable ender and technically 'southern_cross-8.dmm'
- Adjustment of areas dm to give color to centcomm beach area icons
- Fixed SC centcomm dmm file, 'southern_cross-6.dmm'
- Overhaul of xenobio/xenoflora on 'southern_cross-3.dmm'
- addition of heavy duty cables to SC-3.dmm and SC-4.dmm
- Adjustments of southern cross files.
- Changelog?
2017-09-07 17:33:34 -07:00
Cyantime
c246d701b1 Makes passive vents constructable 2017-09-07 16:56:34 -04:00
Mechoid
98af877b21 Xenomorph Tweaks/Buffs. 2017-09-06 13:37:43 -07:00
Neerti
8f00965cc2 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 8/10/2017_make_xenobio_old_again
# Conflicts fixed:
#	code/modules/admin/topic.dm
#	code/modules/admin/verbs/debug.dm
#	code/modules/admin/view_variables/helpers.dm
#	code/modules/mob/living/simple_animal/simple_animal.dm
#	code/modules/mob/transform_procs.dm
#	maps/northern_star/polaris-1.dmm
#	polaris.dme
2017-09-05 00:58:27 -04:00
Neerti
4bfcec55f2 work 2017-09-04 21:52:47 -04:00
Anewbe
9ce3c85127 Merge pull request #3762 from Mechoid/Xeno_Tyranny_Electric_Boogaloo
Brings back the aliens (With hitches).
2017-09-04 18:32:25 -04:00
Anewbe
de3016ca10 Merge pull request #3766 from MagmaRam/AI_plaque
Removes pointlessly offensive text
2017-09-04 16:16:56 -04:00
MagmaRam
f2de8d5261 ha ha, disabilities are a hilarious joke am i right 2017-09-04 11:33:53 -05:00
Anewbe
52b8d17caf Merge pull request #3752 from Woodratt/WR_Floor_type_change
Floor tile, type and carpet change
2017-09-03 17:11:39 -04:00
Anewbe
07564cbcac Merge pull request #3749 from Nalarac/Jetpack
Removes Cyborg Module Restraint on Jetpack
2017-09-03 17:09:43 -04:00
Mechoid
7de08c2420 Fix them Travis errors. 2017-09-03 13:21:05 -07:00
Mechoid
9b044309d2 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into Xeno_Tyranny_Electric_Boogaloo 2017-09-03 01:54:10 -07:00
Mechoid
5d390ca67b Brings back the aliens as they were when removed, minus huggers (until we can get a suitable replacement), for admins to use. 2017-09-03 01:46:08 -07:00
Andrew
d6c4d76d43 Converts dialog to use to_chat
Figured I might as well change the rest of the file while I was add it
2017-08-30 12:40:48 -05:00
Anewbe
0d607488b3 Merge pull request #3737 from Nalarac/PTools
Adds More Ways to Obtain Power Tools
2017-08-29 17:28:25 -04:00
Woodratt
0bd91d1133 Floor tile, type and carpet change
- Ports the floor types, structure, and sprites (techfloor) from Vorestation (who ported them from Eris).
- Fixed missing techfloor floortile sprite icons (ported from Eris).
- No actual new floor sprites sans the techfloor. Saving for when we actually change maps to do that.
- In theory, also added a changelog for what I'm doing. Not sure if worked.
2017-08-28 23:00:15 -07:00
Andrew
ff22f0e365 Removes Cyborg Module Restraint on Jetpack
The jetpack upgrade can now be applied to any cyborg module.
2017-08-27 22:48:31 -05:00