cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-02 20:30:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
41,039 Commits 8 Branches 26 Tags
090c9bd265bd5b02027f21cc924678072bdb931c
Commit Graph

14315 Commits

Author SHA1 Message Date
Leshana
9ca5337c98 PTO Implementation 
* Adds SSpersist which updates people's PTO balance every 15 minutes
* Adds "Off-duty" jobs which can only be taken if you have enough PTO.
 2018-01-28 23:27:21 -05: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
Arokha Sieyes
f06170d185 Sandy footstep sounds 
it's basically carpet right
 2018-01-27 19:22:01 -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
28e4ef603e VS: Steal Southern Cross jobs with tweaks 2018-01-27 14:12:17 -05:00
Arokha Sieyes
67382eebd1 VS: Add some cave and desert turfs using better icons 2018-01-27 14:10:54 -05:00
Arokha Sieyes
b8d2766ee3 POLARIS: Sort jobs into correct departments 
Also give cargo some color
 2018-01-27 14:10:54 -05:00
Arokha Sieyes
d7e54cc0bc POLARIS: Shuttle floor decals go with the shuttle 2018-01-27 14:10:52 -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
Aronai Sieyes
aba8908d95 Merge pull request #2844 from VOREStation/vplk-fix-plating-decals 
Fix decals on plating disappearing when you put flooring on and pry it back off.
 2018-01-27 01:43:29 -05:00
Arokha Sieyes
ff285f92c2 POLARIS: Alter shuttle underturf grabbing 2018-01-26 17:17:40 -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
Leshana
48d154b112 Fix decals on plating disappearing when you put flooring on and pry it back off. 
* Previously floor decals were stored in old_decals when converting to plating, then restored.   Now the reverse is also true,  under-floor decals are stored in old_decals when converting to flooring and then restored.
 2018-01-25 16:29:02 -05:00
Mechoid
6df90c09e3 Allows Prometheans to be cloned from their Core. (#4602) 
* Allows Prometheans to be cloned from their Core.

* Swap brain cloning dependency from the cloner to the brain itself.

* Fffffff Changelog. And to_chat.
 2018-01-24 18:19:32 -06: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
62ba8650b5 Removes Spacing by Wheelchairs (#4615) 
Now you won't spawn in space due to having a wheelchair.
 2018-01-22 23:30:55 -08:00
Neerti
3580b6c3e2 Merge pull request #4603 from Cerebulon/PascalBPoI 
Irradiated Manhole Cover PoI
 2018-01-23 01:34:34 -05:00
Neerti
c2670a2bd5 Makes Overlay Hidden w/o Mesons 2018-01-22 16:12:35 -05:00
Anewbe
d911f3b38f Merge pull request #4611 from VOREStation/vplk-misc-fixes 
Misc. Fixes for Destroy etc.
 2018-01-22 15:03:37 -06: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
SunnyDaise
10490fa5b4 Food and Drink: Additions and Bugfixes (#4598) 
* Food and Drink
 2018-01-21 22:18:33 -08:00
Leshana
00d13c5832 Fix more Destroy / GC issues. 
Fixes recursive Destroy call on containment field.
Fix unable to GC issue on air alarms.
Fix unable to GC issue on radiation sources.
 2018-01-21 22:49:27 -05:00
Leshana
3ccd8efb39 Revert accidental commit of a WIP file. 
This reverts part of commit 62e58702f7.
 2018-01-21 21:01:30 -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
Arokha Sieyes
ba5b0c662f Merge pull request #2809 from VOREStation/vplk-multi-engine 
Dynamic Engine Loading
 2018-01-21 17:48:45 -05:00
Arokha Sieyes
6e07301c03 Merge pull request #2806 from VOREStation/aro-entopics2 
Entopic Framework + AR Features
 2018-01-21 17:43:36 -05:00
Arokha Sieyes
1558cd47df 3 Fixes (#4600) 
* POLARIS: Do this lazily

* POLARIS: Speed up visible_message and audible_message

* POLARIS: Destroy this list rather than cutting it, for future safety
 2018-01-21 16:17:04 -06:00
Anewbe
18e83bc73f Merge pull request #4575 from Neerti/1/17/2018_meteors2 
Meteors No Longer Hurt Floors
 2018-01-21 16:10:07 -06:00
Leshana
71b3ef47a9 Add checks to allow Tesla to fully dissipate once it runs out of energy. 2018-01-21 16:19:13 -05:00
Leshana
62e58702f7 VOREStation Tweaks to the Tesla engine 
* Let you order the Tesla generator from cargo in case you need another one.
* Make the energy ball dissipate very fast if it escapes from confinement, limiting the number of machines it can blow up.
* Reduce devastation on machine destruction so areas are messed up but not just reduced to space.
 2018-01-21 16:19:13 -05: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
Arokha Sieyes
b7f1c41581 POLARIS: Speed up visible_message and audible_message 2018-01-20 22:08:37 -05: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
Atermonera
17accf2e28 Band-aids three runtimes (#4591) 
* Runtime in dna_modifier.dm,330: Cannot read null.occupant

* Runtime in Chemistry-Reagents.dm,47: Cannot execute null.remove reagent().

* Runtime in blood.dm,182: Division by zero

* Compiled with the right map this time
 2018-01-20 13:28:51 -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
eed9f1d6ff Compensated for addition of Planetary Department to PDAs. 2018-01-19 21:09:02 -05:00