Commit Graph

1463 Commits

Author SHA1 Message Date
Cyantime 84c3154b2b Merge branch 'master' into hypo 2018-01-20 01:39:16 -05:00
Leshana 3c3dac7102 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-01-19
# Conflicts:
#	code/_onclick/hud/hud.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	vorestation.dme
2018-01-19 17:52:25 -05:00
Woodratt d1f8e875a8 Southern Cross Bugfixes and additions
- Multiple fixes for map errors, and removal of christmas decor
- Addition of a gym station side, deck one
- nav beacons and beepsky added
- overhaul of the centcomm z to look more like the Northern Star
2018-01-18 20:01:01 -08:00
Cyantime 09eb4054a5 Removes hypospray/vr and vial/vr 2018-01-18 19:01:26 -05:00
Arokha Sieyes dc0e602663 Knife path fix for VS trashpiles and a fluff item 2018-01-18 15:48:14 -05:00
Belsima a0d4549d2e Buffs the mop bucket by the same amount as the janicart. 2018-01-17 19:20:07 -05:00
Cameron653 788d5a68d6 Makes janicarts hold more water (#4558)
* Makes janicarts hold more water

So you don't have to run back to grab some more water every 20 seconds while cleaning up dirt.

* Update janicart.dm
2018-01-17 17:29:49 -06:00
Arokha Sieyes ff228754b3 Merge polaris sync 01 17 2018
Planes, layers, human/update_icon()
2018-01-17 17:56:51 -05:00
Neerti 5b54f4c875 Surface Map Work (#4557)
* Tweaks Surface, POI system

* More Stuff

* Travis Appeasement

* Fixes invisible banner.
2018-01-17 13:46:19 -06:00
Arokha Sieyes f2fef6f410 Planes Framework (#4545)
* Polaris initial plane upstream merge

* POLARIS: Fix RIG visors with new plane system, and material scanner VIS_FULLBRIGHT

* POLARIS: Fix GetFlatIcon so that cameras and id pictures don't show the HUD overlays.

* POLARIS: Adds a 'alter values' proc for plane master ease of tweaking

Setting stuff like colorblindness variety and things.

* Remove NIF reference, fix lighting layer define

* Handle effects above lighting plane

* Moved all layer defines to planes+layers.dm
* Fixed overlays that are supposed to be above lighting to use the PLANE_LIGHTING_ABOVE

* Merge: 3000% human/update_icons() speed improvement

* Merge: Avoid ghosts pointing at things
2018-01-17 13:45:54 -06:00
Leshana 5d5f052eb7 Merge remote-tracking branch 'polaris-upstream/master' commit '613c5984eeeed2757fe7f15877973f81f526323c' into polaris-sync-2018-01-10
# Conflicts:
#	code/game/machinery/atmoalter/area_atmos_computer.dm
2018-01-15 13:27:39 -05:00
Anewbe c632c2604d Merge pull request #4533 from VOREStation/pol-mecha
Two interface QoL changes (closets and mechs)
2018-01-15 01:31:29 -06:00
Neerti 96d3d361d0 Adds Boats, Ports /TG/ Buckling (#4527)
* Adds Boats, Ports /TG/ Buckling

* Travis Appeasement

* Changelog
2018-01-14 14:58:15 -06:00
Arokha Sieyes 60c07e348b Merge pull request #2742 from VOREStation/aro-hudwork
Plaaaaaaanessssssss
2018-01-14 13:08:35 -05:00
Arokha Sieyes 1f595cd59a Two interface QoL changes (closets and mechs) 2018-01-14 03:58:15 -05:00
Arokha Sieyes ad74dec1c0 POLARIS: Planes shenanigans. Begins 'plane' work. 2018-01-14 00:39:59 -05:00
Arokha Sieyes 8dae4a6f04 Merge pull request #2725 from VOREStation/aro-bacon
Refactor Digestion
2018-01-14 00:07:54 -05:00
Mechoid ff02218ccb Hatchets - > Machete subtype. 2018-01-12 21:21:18 -08:00
Mechoid 5efc484595 Makes knives all knives. 2018-01-12 18:02:07 -08:00
Arokha Sieyes 449dcbb0b7 Refactor Digestion 2018-01-10 02:06:13 -05:00
Spades 3e754620b6 Some security firearm changes 2018-01-09 20:40:51 -05:00
Leshana 807f1c7b4b Merge remote-tracking branch 'polaris-upstream/master' into polaris-sync-2018-01-09
# Conflicts:
#	code/game/objects/items/devices/communicator/UI.dm
#	code/game/objects/structures/flora.dm
#
2018-01-09 14:40:09 -05:00
Cyantime 36f8c56537 Fixes 'varient' 2018-01-08 16:42:20 -05:00
Neerti 42a421e8e1 Adds Bonfires 2018-01-05 02:35:19 -05:00
Arokha Sieyes 5c6637cffa Gives the HoS a KHI-102b NSFW
It's just my fluff gun. But sharing is caring.

From the ingame fluff:
"Variety is the spice of life! The 'Nanotech Selectable-Fire Weapon' is an unholy hybrid of an ammo-driven energy weapon that allows the user to mix and match their own fire modes. Up to three combinations of energy beams can be configured at once. Ammo not included."
"This gun is an energy weapon that uses interchangable microbatteries in a magazine. Each battery is a different beam type, and up to three can be loaded in the magazine. Each battery usually provides four discharges of that beam type, and multiple from the same type may be loaded to increase the number of shots for that type."
"The Kitsuhana 'Nanotech Selectable Fire Weapon' allows one to customize their loadout in the field, or before deploying, to achieve various results in a weapon they are already familiar with wielding."

The HoS's includes 2 lethal, 2 stun, 1 net, and 1 ion battery. There are other batteries (like instagib!) but there's no way to get them normally. There's also one that strips people.
2018-01-04 23:57:11 -05:00
Arokha Sieyes d998f36c38 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync2018
# Conflicts:
#	code/game/objects/structures/signs.dm
#	code/modules/mob/living/carbon/human/human.dm
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	code/modules/organs/organ_icon.dm
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	vorestation.dme
2017-12-26 23:07:58 -05:00
Woodratt ed9395e58f SC Stupid Sized Map Update
Or how Woodrat spent too long on something that was supposed to be simple.

- Addition of a Explorer Radio Channel and headsets.
- Explorers and Search and Rescue job slots added
- Adjustments to the pilot job including getting rid of the flatcap
- Map fixes, adjustments, (including signs pointing to cryo) planetside side map additions splitting up of the wilderness into two area sections
- Disabled lighting on the arrivals shuttle area once it is docked with the station, should help with the whole issue of lighting bugging out and having dark space
- Fixed EMS jacket missing icons
- Fixed Research signs being missing for some reason, addition of directional signs for cryo
- Addition of a Search and Rescue Winter coat
- Probably a dozen other small bug fixes I forgot, and bug additions

Tested, seems fine. At least in short tests.
2017-12-24 07:04:34 -08:00
mistyLuminescence c986d57c34 Med Pill Blue Pill (#4404)
* Fixes 4412
* Rebalanced medical gear spawns
* Pill bottle code touched up
2017-12-23 14:45:24 -08:00
killer653 3a2093ef40 Polaris sync 2017-12-21 04:01:07 -05:00
Anewbe 3b89c5e320 Merge pull request #4384 from Belsima/maid
Adds maid bonnet, more hair pins, and adds maid uniform to locker.
2017-12-12 19:51:35 -06:00
mistyLuminescence 203110bc8f Fixes rollers and mediborgs (#4430)
* Fixes rollers and crisis borgs

* a space
2017-12-11 00:47:52 -06:00
Belsima ad0ad62cde The game actually clicks when it claims to. (#4403)
* Update paiwire.dm

* Update life.dm

* Update traps.dm

* Update safe.dm

* Update alarm.dm

* Update safe.dm

* Update implant.dm

* Update life.dm

* Update traps.dm

* Update life.dm

* Update safe.dm

* Audible message test
2017-12-07 18:18:01 -06:00
mistyLuminescence 4b102b7870 Adds food bags! (#4389) 2017-12-07 17:49:59 -06:00
Anewbe 1499a48238 Merge pull request #4410 from Belsima/fuckssake
can you seriously not spell sticky
2017-12-07 17:31:29 -06:00
Anewbe 690c041aa4 Merge pull request #4396 from PrismaticGynoid/ghostlocker
Ports ghosts examining locker contents
2017-12-05 14:34:18 -06:00
Belsima d266b67eba can you seriously not spell sticky 2017-12-05 12:50:04 -05:00
mistyLuminescence 0d458b204e Adds the advanced health analyzer (#4326)
* WIP - advanced health analyzer

* Adds the advanced health analyzer.

* Updates radiation levels

* Fixes travis and removes snark

* Fixes a bug that wasn't my fault (for real)

* Adds tiers.

* Phasic sounds cooler

* Fixes sprites
2017-12-03 17:36:51 -06:00
PrismaticGynoid fe9d6864c0 Ports ghosts examining locker contents
A port of https://github.com/Baystation12/Baystation12/pull/19436 . Ghosts clicking on a locker or crate to examine it can now see a list of its contents.
2017-12-03 15:25:04 -08:00
Belsima 0a76047cef Loadout adjustments. 2017-12-02 08:59:46 -05:00
Neerti af5c633cdb Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 10/28/2017_new_blob
# Conflicts:
#	code/game/atoms_movable.dm
2017-11-29 22:43:05 -05:00
Neerti acb208dd3f Works on New Blob 2017-11-29 22:35:01 -05:00
Neerti 2f7db506eb Adds Variable Click Delay
Now certain weapons can strike faster or slower than usual. No weapons currently do this as this PR just lays the groundwork for that.
The click delay can also be modified with traits. The slime agility modifier makes attacks happen 25% sooner.
Adds debug test verb to display a weapon's DPS. It's really basic but should be sufficient for future force adjustments I might do in the future.
2017-11-28 16:11:56 -05:00
Anewbe adcb39b727 Fixes rollerbed sprites 2017-11-28 00:10:00 -06:00
Neerti 667931ae2d Merge pull request #4338 from Belsima/signs
Adds signs.
2017-11-27 20:22:24 -05:00
mistyLuminescence e4ff301c01 Advanced Roller Bed (#4319)
* Adds the advanced rollerbed to R&D

* default surgery rate

* finally
2017-11-27 16:40:52 -06:00
Neerti a414fc0453 Pleases Travis hopefully. 2017-11-26 15:26:17 -05:00
Neerti 01aaccf893 Finishes UFO PoI 2017-11-26 15:10:25 -05:00
Neerti 7497aef295 work 2017-11-26 12:08:05 -05:00
Belsima e425a3bd21 what if COmpile 2017-11-24 20:48:06 -05:00
Belsima 27a6fa9e7b Adds signs. 2017-11-24 20:34:42 -05:00