Commit Graph

7064 Commits

Author SHA1 Message Date
Verkister
85e5731713 Adds dufflebags to loadout.
-Adds dufflebags to loadout, including normal, black(cosmetic), and department specific versions with appropriate access restrictions to utility category.
-Adds a cosmetic black duffle without the syndie speed buff.
-Moves taur saddlebags from accessories category to utility category.

Just a little preference QoL thing when you don't feel like scavenging and littering the station with discarded starter bags.
2018-01-30 13:14:39 +02:00
Leshana
27c3272821 Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-01-27
# Conflicts:
#	code/ZAS/_docs.dm
#	code/__defines/mobs.dm
#	code/game/turfs/flooring/flooring_decals.dm
#	code/game/turfs/simulated/walls.dm
#	code/modules/client/preference_setup/loadout/loadout_utility.dm
#	code/modules/lore_codex/codex.dm
#	code/modules/mob/living/life.dm
#	code/modules/mob/living/living_defines.dm
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	maps/southern_cross/southern_cross-7.dmm
#	maps/southern_cross/southern_cross_jobs.dm
#	vorestation.dme
2018-01-27 23:08:53 -05:00
Aronai Sieyes
88cab44124 Merge pull request #2848 from VOREStation/aro-exploration
Exploration Update
2018-01-27 15:32:42 -05:00
Arokha Sieyes
19b2d5a338 VS: Polaris already has this, I need it now though 2018-01-27 14:10:51 -05:00
Arokha Sieyes
1910940c43 VS: Remove some bad VS edits 2018-01-27 14:10:50 -05:00
Arokha Sieyes
8a147d5a3a POLARIS: Move these defines elsewhere 2018-01-26 17:17:40 -05:00
Arokha Sieyes
716a932f26 POLARIS: Allow pulling objects through step teleports. 2018-01-25 16:44:30 -05:00
Neerti
891440376b Merge pull request #4624 from Anewbe/skyfall
Falling from the sky should work again
2018-01-24 19:17:31 -05:00
Anewbe
dca25babf6 Merge pull request #4623 from Woodratt/01232018_sc_top_gun
Southern Cross Pilot DLC Update
2018-01-24 17:05:07 -06:00
Anewbe
4706e8d0cc Falling from the sky should work again 2018-01-23 23:40:03 -06:00
Anewbe
dfa6de7a43 Merge pull request #4613 from Neerti/1/21/2018_there_is_no_ceiling
Adds Missing Ceiling Overlay + Fixes Space on Roof
2018-01-23 18:19:47 -06:00
Woodratt
f8394ca19a Southern Cross Pilot DLC Update
- Addition of two pilot uniforms x2 pilot helmets x2 pilot uniforms (+ webbing) x1 blue pilot jacket. Basic Teshari sprites included.
- Pilot uniforms done by ASN set as default pilot outfit. Other uniform will be in the loadout when we switch maps
- SAR get Explorer radio channel access
- More map fixes and additions. In theory skies of sif should no longer be vacuum. Oxygen required as super cold.
- Removal of Explorer pilot access due to the shuttles having autopilot now.
2018-01-23 15:42:57 -08:00
Anewbe
b13148a051 Merge pull request #4610 from VOREStation/vplk-breakerbox
Allow constructing breaker boxes in game
2018-01-23 12:05:48 -06:00
Neerti
3580b6c3e2 Merge pull request #4603 from Cerebulon/PascalBPoI
Irradiated Manhole Cover PoI
2018-01-23 01:34:34 -05:00
Neerti
d71a610a97 Adds Missing Ceiling Overlay + Fixes Space on Roof
On Multi-Z compatible maps, if a tile is missing a ceiling (IE there is an open space above it), it will display an overlay to show this. This makes it easier to know where the hole in the ceiling is without having to go to the ceiling. Overlay sprite by Mechoid.
Also fixes space tiles appearing when meteors/explosions/other fun things occur on the Southern Cross map instead of open space.
2018-01-22 14:27:19 -05:00
Arokha Sieyes
9016ca94c0 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync01222018
# Conflicts:
#	code/modules/mob/mob.dm - Whitespace? No real conflict.
#	code/modules/mob/mob_planes.dm - Comment conflict, was a late port to Polaris.
2018-01-22 12:10:19 -05:00
Leshana
01925e9de2 Add circuit and research design to allow constructing breaker boxes in game. 2018-01-21 20:36:44 -05:00
Cerebulon
0561819bd3 capitalization of item 2018-01-22 00:30:53 +00:00
Cerebulon
cd80242b81 Cover emits low-level radiation 2018-01-21 06:53:15 +00:00
Anewbe
215bbb89e7 Merge pull request #4595 from Mechoid/Gas_Tank_Extension
Chainsaw tweaks. Take two.
2018-01-21 00:40:26 -06:00
Leshana
805897eafb Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-01-20 2018-01-21 00:23:00 -05:00
Cerebulon
53e546c526 Radioactive Manhole 2018-01-21 04:42:21 +00:00
Anewbe
e5b424e9a8 Merge pull request #4588 from VOREStation/vplk-tesla-book
Added operating manual book for Tesla
2018-01-20 20:01:38 -06:00
Cyantime
84c3154b2b Merge branch 'master' into hypo 2018-01-20 01:39:16 -05:00
Mechoid
ebc03cceac Tweaks chainsaws. Again. 2018-01-19 21:11:48 -08:00
mistyLuminescence
a190ec5725 Allows modkits to be created for any item. (#4450)
* Adds modular modkits
* Adds explorer suit functionality to voidsuit modkits.
2018-01-19 18:11:28 -08: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
Leshana
488c88b348 Added operating manual book for Tesla 2018-01-19 17:26:45 -05:00
Anewbe
8c2d1208e0 Merge pull request #4585 from Woodratt/01182018_SouthernCross_MapFixv6
Southern Cross Bugfixes and additions
2018-01-19 15:37:52 -06:00
Anewbe
674cc18554 Merge pull request #4582 from Mechoid/Tacknives_Angry_Again
Fixes Tacknife oversight. Fixes comments regarding knives.
2018-01-18 22:23:58 -06: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
Spades
8e42db3e7f More guns for the gun box
- NT Mk98 (re)added.
- P92X added.
2018-01-18 18:53:43 -05:00
Anewbe
a7cb2ff3ad Merge pull request #4566 from Mechoid/Make_Spears_Less_Murder
Drops the spear damage modifier from 0.75 to 0.5.
2018-01-18 16:40:16 -06:00
Anewbe
6d4e310659 Merge pull request #4570 from Belsima/master
Buffs the mop bucket by the same amount as the janicart.
2018-01-18 16:40:03 -06:00
Mechoid
4a6a1dbf5c Fixes Tacknife oversight. Fixes comments regarding knives. 2018-01-18 14:20:55 -08:00
Arokha Sieyes
dc0e602663 Knife path fix for VS trashpiles and a fluff item 2018-01-18 15:48:14 -05:00
BillyBangles
c44af58716 Adds communicator watch (take 2) (#4406)
* adds communicator watch

* adds commwatch to a loadout selection list

* adds changelog

just in case
2018-01-17 19:33:32 -06:00
Belsima
a0d4549d2e Buffs the mop bucket by the same amount as the janicart. 2018-01-17 19:20:07 -05:00
Arokha Sieyes
508ea0d6a3 Merge pull request #2775 from VOREStation/syncomatic
Polaris Sync
2018-01-17 18:36:35 -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
Mechoid
55845cb248 Drops the spear damage modifier from 0.75 to 0.5. 2018-01-17 13:41:05 -08:00
Leshana
fe431c8e46 Trims back wilderness code that was dependent on tether map.
* Reverted random.dm back to Polaris as there is no need for the VOREStation customs.
* Fixed /obj/random/outside_mob so it will actually work (You can't set vars on a type!)
* Removed all wilderness code outside of the tether map.  It was only setting life_disabled on mobs spawning there. We can do that with a subsystem or by dynamic maploading instead.
2018-01-17 15:23:22 -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
Arokha Sieyes
0a037f0fe0 Merge pull request #2755 from VOREStation/polaris-sync-2018-01-10
Polaris Sync 2018 01 10
2018-01-16 02:46:25 -05:00
Arokha Sieyes
2b8063418a Merge pull request #2758 from VOREStation/aro-updateicons
3000% human/update_icons() speed improvement
2018-01-16 02:44:30 -05:00
Arokha Sieyes
10aabd98da POLARIS: 3000% human/update_icons() improvement
Using overlays in lists and a mutable_appearance
2018-01-15 21:39:47 -05:00
atermonera
edcd9f5d73 Fixes runtime in uplink.dm 2018-01-15 16:35:04 -08:00