cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-01 03:42:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
47,932 Commits 8 Branches 26 Tags
11c19e46ced4793ca2980cb236d8ef773b4c8afd
Commit Graph

1887 Commits

Author SHA1 Message Date
Unknown
0d73c8ad76 Early Polaris Ports 
Ports Polaris PRs 6424, 6426, 6428, 6430, 6431, 6432, 6433, and 6434

No vorestation edit markings because they are polariscode ports.
 2019-08-30 23:55:58 -04:00
Unknown
4bccbedc91 Minor Fixes 
- Brings pizza back at 50 points which it was supposed to be.
 2019-08-24 18:26:50 -04:00
Novacat
06fcadf97f Merge pull request #5688 from VOREStation/upstream-merge-6396 
[MIRROR] Chemistry Expansion
 2019-08-21 18:01:11 -04:00
Atermonera
8f067fe785 Chemistry Expansion 2019-08-21 17:43:01 -04:00
Atermonera
caa612e264 Uniform Adjustments Phase 1 2019-08-21 17:26:28 -04:00
Novacat
99d9653902 Merge branch 'master' into Toricrates-Remastered 2019-08-19 16:56:12 -04:00
Michiyamenotehifunana
3a676ad02e Adds Toricrates and stuff 2019-08-15 22:22:28 +08:00
Unknown
41497775aa Adds a compact defibrillator crate 
Mostly a solution if there are a lot of EMTs/Field Medics on shift, so there is less necessity to fight over the single compact defibrillator
 2019-08-06 21:01:49 -04:00
Unknown
32d5efa915 Fixes Subtle Teleporter 
Fixes a problem with the subtle teleporter not working outside of station Z Levels.
 2019-08-04 13:46:38 -04:00
Novacat
8f00834eb8 Merge pull request #5526 from VOREStation/upstream-merge-6324 
[MIRROR] Adds Laser Tag Turrets Plus Changes
 2019-07-27 16:26:30 -04:00
Andrew
69ed422019 Adds Laser Tag Turrets Plus Changes (#6324) 
* Adds Laser Tag Turrets

* Adds changelog

* Reverts Lethal Turrets Shooting to Kill

* Small No Longer Means Misc Life

* Revert "Merge branch 'master' into Turret"

This reverts commit 0300e6723b1aec0c47f8f82f7db770aa29af2483, reversing
changes made to 219348783d49b3205c3ed64bdd604f61791e6e72.

* Revert "Revert "Merge branch 'master' into Turret""

This reverts commit ca3d13b3372f2c5587d8d2cc449a6da8503494e4.

* Github why

* Change laser.dm to master?

* Revert "Change laser.dm to master?"

This reverts commit da562f6bc1ec43fe0cf5fe6ec5af61ada3474dd9.
 2019-07-27 15:45:58 -04:00
Andrew
b30f9ffd0f Adds Specialized SMES Coils to Suppy Console (#6329) 
* Adds Specialized SMES Coils to Suppy Console

The capacitance and transmission coils are order-able for 90 points in the engineering section. (Standard coil is 75)

* Adds changelog
 2019-07-27 13:11:34 -04:00
Heroman
e4aae2a5a3 Fixes hardsuit crates not using one_access 2019-07-24 04:58:59 +10:00
Atermonera
54966826af Merge pull request #6320 from Nalarac/Autolathe 
Allows Multiple Light Printing in Autolathe
 2019-07-22 00:44:30 -04:00
Unknown
3d3452bdca Ups point cost of pizza 2019-07-05 20:24:41 -04:00
Atermonera
3d31a77514 Multi-Tile Objects, Multi-Tile Hovershuttle 2019-07-01 20:43:53 -04:00
Heroman
c11a1fc16e Fixes spawning of action figures in crates. 2019-07-01 06:49:27 +10:00
Novacat
ce70e5b3a2 Merge pull request #5395 from VOREStation/upstream-merge-6194 
[MIRROR] Adds two new Cargo crates!
 2019-06-30 01:59:45 -04:00
Novacat
be853c735b Update security.dm 2019-06-29 22:38:46 -04:00
mistyLuminescence
c406672c26 Adds two new Cargo crates! 2019-06-29 19:46:41 -04:00
Anewbe
3da73d53f3 Merge pull request #6244 from Heroman3003/cargofix 
Fixes glucose crate spawning
 2019-06-29 19:26:57 -04:00
Heroman
180d8e8df0 Standartizes _vr container definitions 2019-06-29 04:17:59 +10:00
Heroman
cbb37fdeb1 One more forgotten exception 2019-06-28 17:13:42 +10:00
Heroman
a16fcd2ae5 Fixes quantum pad and telepad teleportations 2019-06-28 05:51:05 +10:00
mistyLuminescence
711e807d32 tinytweaks 2019-06-21 17:07:51 -04:00
Neerti
21244ade2f Merge pull request #6204 from Ketrai/worms 
Adds worms
 2019-06-11 17:35:11 -04:00
Atermonera
8e215ec10f Allows supplypacks with req_one_access to exist 2019-06-04 13:15:14 -04:00
Spades
1ddecf112e Merge pull request #5292 from Ketrai/fishbranch 
Adds lobsters and cuttlefish
 2019-06-03 21:06:22 -04:00
Novacat
b88ba6f233 Merge pull request #5279 from Heroman3003/crateaccess 
Access fixes for carogopacks
 2019-06-02 14:45:57 -04:00
Heroman
3e62bbcca1 Moves restriction to _vr file 2019-06-02 07:13:15 +10:00
Ketrai
95edaac47c Adds monkfish 
ITS HOOG
 2019-05-31 17:17:29 +02:00
Ketrai
e9cc1e48ab Adds lobsters and cuttlefish 2019-05-29 22:37:59 +02:00
Atermonera
ef4c7b6601 Merge pull request #6172 from mistyLuminescence/contacts 
Makeover Kit
 2019-05-28 13:10:09 -04:00
Heroman3003
43cad962c6 More adjusting 2019-05-28 12:21:13 +10:00
Heroman3003
7ef057227c Access fixes for carogopacks 2019-05-28 12:13:55 +10:00
Heroman
ed55a2f6cd Fixes Offduty engi and explorers spawning without survival boxes 2019-05-05 08:17:51 +10:00
Atermonera
8e724ad32c Merge pull request #6133 from Heroman3003/cart-tweek 
Minor PDA cartridge tweaks
 2019-05-01 14:08:33 -04:00
Novacat
fb52ec08c6 Merge pull request #5114 from Novacat/nova-weapons 
Expedition Sub-department
 2019-04-28 22:57:13 -04:00
Neerti
16b3b58259 [REVIEW] Ports Modular Computers from Baystation 2019-04-28 22:06:40 -04:00
Novacat
536d209e29 Update civilian.dm 2019-04-27 22:33:06 -04:00
Anewbe
13ccd7533f Removes Resident from the Southern Cross 2019-04-27 21:05:10 -04:00
Unknown
729b1fc662 Changes off Duty ID Aesthetics 2019-04-25 19:56:47 -04:00
Unknown
f21c5e4430 Adds Subtle Teleporter 
It is also a structure, which should make it easier to use in buildmode. Current uses vanilla portal sprite.
 2019-04-24 20:20:51 -04:00
Unknown
8fef0c5045 Survival Kits for Off Duty Explorers 
...I love those things too much.
 2019-04-24 14:00:11 -04:00
Atermonera
9152030002 Merge pull request #6117 from Neerti/ai_shell_manifest_fix 
Hides AI Shells from the manifest.
 2019-04-22 14:31:22 -04:00
Unknown
afc0d67f21 [WIP] Expedition Sub-department 
- Moves explorer job roles from their respective departments into an Exploration sub-department
- CHAIN OF COMMAND WILL REMAIN UNCHANGED
- ACCESS WILL REMAIN UNCHANGED
Note: Pathfinder's minimum access is getting tweaked, in case minimum access ever gets used.

This is a purely clerical change that is being done for two reasons.
1: To enable off duty exploration role, important for the upcoming timeclock PR. The upcoming timeclock functionality will cause difficulties for expedition roles, due to, at present, being in a wide variety of different departments.
2: Generally, explorer roles in other departments tended to create confusion, as people would ask (or even demand) those roles to do station-side duties, even if their access (or lack thereof) made it impossible.
 2019-04-21 17:05:58 -04:00
Neerti
068ac72e10 Merge pull request #6076 from Heroman3003/double-shock-fix 
Fixed the vendor machines zapping twice
 2019-04-14 02:24:50 -04:00
Heroman
c62a184d15 Fixes organizations runtiming 2019-04-12 19:24:04 +10:00
Novacat
cc0893409f Merge pull request #4960 from Heroman3003/telenommening 
Fixes telenoms via command teleporter, fixes command teleporter sprites
 2019-04-08 19:15:58 -04:00
Novacat
466516b066 Revert "Un-kevinzes nanoui and chemistry subsystems back into processes for greater good" 2019-04-08 15:24:27 -04:00