cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-01-30 19:03:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,264 Commits 8 Branches 26 Tags
37a2a052d9e459b7d93baeab9676d61a549089f6
Commit Graph

16990 Commits

Author SHA1 Message Date
Aronai Sieyes
e9c904b8e7 Merge pull request #8260 from lbnesquik/Kot-Explorer-Shield 
Introduce a SINGLE themed, colored explorer shield.
 2020-06-15 11:33:14 -04:00
Atermonera
bcd18e4997 Merge pull request #7278 from VOREStation/vplk-unused-image-assets 
Remove Unused Image Assets
 2020-06-14 21:32:34 -04:00
Novacat
4e889046e9 Merge pull request #8274 from Novacat/nova-basicfixes 
Vox Phoron and Adminbus Backpacks
 2020-06-14 15:48:40 -04:00
Novacat
1cd8d17e51 Merge pull request #8264 from VOREStation/upstream-merge-7257 
[MIRROR] Telecomms fixes
 2020-06-14 15:38:04 -04:00
Novacat
08d50ee600 Update machinery.dm 2020-06-14 15:21:47 -04:00
Unknown
967f67bf37 Replaces exploration autoloks with emergency suit wall lockers 2020-06-14 14:18:23 -04:00
Unknown
19d7b71382 More miscellaneous changes 2020-06-14 13:46:16 -04:00
Unknown
0412103fc2 Vox Phoron and Adminbus Backpacks 
- Fixes broken object sprites for adminbus backpacks
- Increases default air contents of Vox Phoron tank to 10 atmos (up from 6 atmos)
 2020-06-14 12:15:58 -04:00
Atermonera
69c3c8c98f mining drill and recharger find their shiny new cells 2020-06-13 06:57:09 -04:00
Atermonera
ef73f26b92 Telecomms fixes 2020-06-13 01:37:04 -04:00
lbnesquik
856d48467a Introduce a SINGLE themed, colored explorer shield 
It is a simple hunk of metal, painted to a moody green or dangerous voidsuits purple and blacks.
It has a lower block chance than the real deal, but it is still a strong help against melee foes and the occasional beam or two. Do mind that those seem to be a lot squishier since the AI update.
And just like any tacticool object, it has a big flashlight stuck at the front to help with visibility, it's not like you can actually see much out of that slit.
You can order two for 80 points at cargo.
It actually starts in the pathfinder locker, meaning they decide whether or not it will be used.
 2020-06-11 04:14:54 +02:00
Aronai Sieyes
d52aefa12b Merge pull request #8252 from VOREStation/Arokha/telebug 
Fix bug with in-round constructed teleporters
 2020-06-10 17:31:35 -04:00
Aronai Sieyes
275eeb4400 Fix bug with in-round constructed teleporters 2020-06-10 10:44:22 -04:00
Aronai Sieyes
fbeda45d2c Restore large bin to glory 2020-06-10 10:24:03 -04:00
H0lySquirr3l
34dafd1d58 Adds in Food cart to the kitchen. (#8238) 
* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload
 2020-06-09 10:05:56 -04:00
Cyantime
7349f8831a Fixes cyborg rechargers not recharging 2020-06-08 19:43:27 -04:00
Heroman
391f7c2178 Fixes going onduty as AI 2020-06-09 05:21:58 +10:00
Aronai Sieyes
0add273cc4 Merge pull request #8225 from Heroman3003/recoloring 
Brings some variety and color to back to closets
 2020-06-08 11:33:23 -04:00
Killian
02e5020cfe talon suits & jetpacks 2020-06-07 21:22:55 +01:00
Aronai Sieyes
16c7486606 Merge pull request #8228 from VOREStation/Arokha/erisplating 
Change eris plating paths
 2020-06-07 15:07:32 -04:00
Aronai Sieyes
96c9108637 Merge pull request #8220 from VOREStation/upstream-merge-7266 
[MIRROR] Vintage Voidsuits Expansion
 2020-06-07 15:05:28 -04:00
Aronai Sieyes
d6bd02f3f4 Update suit_storage_unit.dm 2020-06-07 14:50:18 -04:00
Aronai Sieyes
e27f831bc5 Merge pull request #8219 from VOREStation/upstream-merge-7264 
[MIRROR] Adds marble floor tiles and crafting recipe
 2020-06-07 14:36:35 -04:00
Aronai Sieyes
002b0ce5db Merge pull request #7801 from Holdelta/hol-rms 
New Engineering Tool - RMS: Rapid Material Synthesizer
 2020-06-07 14:01:57 -04:00
Arokha Sieyes
89eed2d16d Change eris plating paths 
Not on the turfs, no map changes needed, just the /decls to avoid some issues.
 2020-06-06 22:28:13 -04:00
Heroman
f55b419803 Slight adjustments + name 2020-06-07 07:09:08 +10:00
Heroman
273f7540b6 Brings some variety and color to back to closets 2020-06-07 06:45:22 +10:00
Killian
2acd444f33 Vintage Voidsuits Expansion 2020-06-06 14:40:47 -04:00
BillyBangles
75901775a0 Adds marble floor tiles and crafting recipe (#7264) 
* Adds marble floor tiles and crafting recipe

* swaps screwdriver removal for crowbar

* changelog fix
i'm a silly goose and forgot to edit out the screwdriver bit
 2020-06-06 14:36:25 -04:00
Aronai Sieyes
499b9b51f4 Merge pull request #8204 from VOREStation/upstream-merge-7241 
[MIRROR] Adds proc to replace default cells with high cap on machinery
 2020-06-05 15:53:51 -04:00
Atermonera
28e952806c Adds proc to replace default cells with high cap on machinery (#7241) 
* Adds proc to replace default cells with high cap on machinery

* *grumbling*
 2020-06-04 22:38:39 -04:00
Atermonera
09d5356ba2 Merge pull request #7262 from lolman360/master 
fixes hybrid crowbars
 2020-06-04 22:26:59 -04:00
Aronai Sieyes
c6b1e4f53e Merge pull request #8174 from VOREStation/Arokha/lava 
Prevents lava from being blown up
 2020-06-01 20:56:04 -04:00
Aronai Sieyes
b8355dd464 Prevents lava from being blown up 2020-06-01 13:42:24 -04:00
Aronai Sieyes
27d3bf2b0f Merge pull request #8169 from VOREStation/upstream-merge-7247 
[MIRROR] Port various auto-decorating floors from Eris
 2020-06-01 13:11:41 -04:00
Atermonera
6219a0b4e8 Port various auto-decorating floors from Eris 2020-06-01 12:29:14 -04:00
Arokha Sieyes
1738b66b3c Be really specific about turf decal layers 2020-05-31 22:55:36 -04:00
Aronai Sieyes
852cdbc347 VS: Add Autolok wall lockers and put some around various maps 2020-05-31 16:59:39 -04:00
Aronai Sieyes
d5de7fc136 Don't let people hide in tiny wall closets 2020-05-31 16:58:57 -04:00
Aronai Sieyes
9789b1d565 Add emergency suit cooler unit with fixed lowpower cell 2020-05-31 16:58:39 -04:00
Aronai Sieyes
b7a22c755f Add icon bases since these are invisible on map otherwise 2020-05-31 13:07:19 -04:00
Aronai Sieyes
7c4428d697 Prep for map updates 2020-05-31 12:39:39 -04:00
Aronai Sieyes
7d69c69f14 VS: Port Bay's lockers and stuff 2020-05-31 12:26:00 -04:00
Aronai Sieyes
719151a74a Port Bay's lockers, crates, largecrates, wall lockers 2020-05-31 12:26:00 -04:00
Aronai Sieyes
35eee1fe2a Merge pull request #8149 from VOREStation/upstream-merge-7164 
[MIRROR] Ported /tg/ style screen alerts, replacing the hunger icon with them
 2020-05-31 12:15:48 -04:00
Atermonera
619e8b1b94 Ported /tg/ style screen alerts, replacing the hunger icon with them 2020-05-31 11:52:17 -04:00
Atermonera
a06aa9bdf6 [PORT] Static Machinery Power 2020-05-31 11:16:41 -04:00
Aronai Sieyes
f134b8ca2e Merge pull request #8128 from VOREStation/upstream-merge-7225 
[MIRROR] Increase the amounts of SNACKS and cigarettes in vending machines.
 2020-05-30 14:10:08 -04:00
Atermonera
16fea47d24 Increase the amounts of SNACKS and cigarettes in vending machines. 2020-05-30 13:59:35 -04:00
Aronai Sieyes
5a56f0627f Make mapped in decals above auto-floor decals 2020-05-29 20:52:11 -04:00