cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-03 04:40:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
41,043 Commits 9 Branches 26 Tags
f3dc6add6ca940340d645b2cf28f014eebd80c0d
Commit Graph

4313 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
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
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
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
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
Mechoid
4a6a1dbf5c Fixes Tacknife oversight. Fixes comments regarding knives. 2018-01-18 14:20:55 -08: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
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
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
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
Stevenator1
cd59a2e928 Fix uses of TECH_MAGNETS to TECH_MAGNET 2018-01-15 03:27:26 -05:00
Anewbe
2dd4597480 Merge pull request #4537 from Cerebulon/tesharitankfix 
Fixed teshari sprites for back-slot air tank items.
 2018-01-15 01:31:15 -06:00
Mechoid
d8d769ac33 Chainsaw fix and cleanup (#4538) 
* Fixes/Cleans up chainsaws.

* Further Chainsaw Updoots
 2018-01-15 01:31:04 -06:00
Arokha Sieyes
eb6c482794 Shamelessly steal Polaris' Southern Cross jobs 
They're whitelist only for now, good for events and adminbuse.
 2018-01-14 21:49:19 -05:00
Cerebulon
d7f4193618 fixed teshari sprites for back-slot air tank items. 
Sprites existed but code was missing.
 2018-01-15 02:24:46 +00:00
Anewbe
cb22407e7c Merge pull request #4535 from Cameron653/patch-2 
Fixes a typo causing deconstructor to cry
 2018-01-14 15:32:04 -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
Neerti
3715fa1f12 Ports /TG/'s Marker Beacons (#4529) 
Ports an item stack that can be used to mark trails, useful for explorers, miners, and anyone else who doesn't want to get lost or wants to make the room more colorful.
 2018-01-14 14:48:39 -06:00
Spades
b441ccd6e3 9mm pistol updates (#4480) 
* These aren't supposed to be here!!

* Adds new Security pistol and large capacity magazines

* Removes new pistol from Security spawns

* Removed references of Beretta because it's not one
 2018-01-14 14:45:15 -06:00
Cameron653
f8ef84d896 Fixes a typo causing deconstructor to cry 2018-01-14 14:49:58 -05:00
Arokha Sieyes
60c07e348b Merge pull request #2742 from VOREStation/aro-hudwork 
Plaaaaaaanessssssss
 2018-01-14 13:08:35 -05:00
Neerti
cd298b1575 Merge pull request #4526 from Mechoid/Now_Those_Are_Knoifes 
Knife refactor and minor changes regarding.
 2018-01-14 01:33:39 -05:00
Arokha Sieyes
9a56c27c9f Merge pull request #2711 from VOREStation/aro-nifrep 
Advanced NIF Repair Tool
 2018-01-14 00:58:18 -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
Arokha Sieyes
ec7ebd1650 Merge pull request #2714 from Verkister/forbiddentaurs 
Enables 2 compatibility lacking fluff taur types.
 2018-01-13 23:41:34 -05:00
Atermonera
30352e1c9b "Communicators have a flashlight" (#4523) 2018-01-13 21:49:58 -06:00
Mechoid
ff02218ccb Hatchets - > Machete subtype. 2018-01-12 21:21:18 -08:00