cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-01-30 02:44:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
59,088 Commits 8 Branches 26 Tags
f0d0970895787c4e9dd76f11d4e2da089e2d83e2
Commit Graph

1484 Commits

Author SHA1 Message Date
Aronai Sieyes
8bcd31c91e Merge branch 'master' into Arokha/matdefs 2021-07-07 14:29:30 -04:00
Aronai Sieyes
e4b8407fdb Merge pull request #10908 from MarinaGryphon/spannening 
Converts visible_message notice spans to look more like emotes
 2021-07-05 16:30:03 -04:00
MarinaGryphon
fdd1c5b7d8 Fixes a few issues with brackets being escaped when they shouldn't be. 2021-07-05 10:23:46 -05:00
MarinaGryphon
e41c2ecfd7 first pass (emotification, some \the -> \The) 2021-07-05 09:42:48 -05:00
Aronai Sieyes
b71c7e7271 Use material defines more 2021-07-03 18:18:05 -04:00
Aronai Sieyes
47291e79d3 Merge pull request #10819 from VOREStation/Icons/guns 
Swap some guns for Eris ones
 2021-07-03 17:13:44 -04:00
Aronai Sieyes
450ab17039 Merge branch 'Icons/guns' of https://github.com/VOREStation/VOREStation into Icons/guns 2021-07-03 16:42:12 -04:00
Aronai Sieyes
6e14329b2d Move stun revolver 
Those other PRs fell through I guess
 2021-07-03 16:42:09 -04:00
Aronai Sieyes
56c4d7985b Merge pull request #10792 from VOREStation/Arokha/portamed 
Eris portable freezer, medical briefcase
 2021-07-03 16:26:07 -04:00
Aronai Sieyes
115005077e Implement heroman suggestion 2021-07-03 16:17:20 -04:00
Aronai Sieyes
99874850ba Merge branch 'master' into Icons/guns 2021-07-01 11:04:34 -04:00
Aronai Sieyes
504f9b58f8 Swap some guns for Eris ones 
Also give proper inhands for shrink, oliv and gisk and ge_
 2021-06-30 10:08:19 -04:00
Aronai Sieyes
4c12504e3b Replace list inputs with tgui_input_list 2021-06-26 10:39:56 -04:00
Novacat
7f5d51a928 Merge pull request #10729 from klaasjared/Netgun-Upgrade 
Netgun Upgrade
 2021-06-23 12:30:00 -04:00
klaasjared
16c1902b3a Adds the code and icons 
Add the required code and icons for the status indicator upgrade on the weapon.
 2021-06-22 15:16:37 -04:00
MarinaGryphon
385fa640af Linter diagnostics + bans non-var relative pathing 2021-06-20 18:16:45 -04:00
TheDavestDave
a88766387d stops handbow changes overiding engery bow 
I didn't know it existed
 2021-06-20 20:16:32 +01:00
Unknown
40b6fa692f Phaser tweaks and bugfixes 
-Slightly increases the energy cost of low power phaser modes.
-Fixes a typepath error for unlocked phaser bows
-Fixes a typo in phaser bows
 2021-06-19 20:40:41 -04:00
Novacat
8b447d8b1d Merge pull request #10662 from VOREStation/Arokha/lights2 
Port current /tg/ lighting system
 2021-06-18 00:21:58 -04:00
Aronai Sieyes
05fc5d3758 Fix requested things 2021-06-17 23:52:39 -04:00
Aronai Sieyes
db14882664 Port tg lighting system 
Also converts planet lighting to a new system
Too hard to separate out from this PR
 2021-06-17 00:18:09 -04:00
Aronai Sieyes
7ec0b43240 VS: Move most/all overlay use to SSoverlays 2021-06-17 00:14:31 -04:00
TheDavestDave
c9c0c77054 adds the phaser handbow 
adds a resprited phaser holdout. Instead of a beam it does a bolt that does the exact same damage. it also has no non-taser replacement becuase it needed it's own spirte and I already modded it twice for lethal and low power.
 2021-06-15 23:37:51 +01:00
Aronai Sieyes
869520f818 Remove extra asterisks from rune audible messages 2021-05-31 13:13:57 -04:00
Aronai Sieyes
177fd15c30 Various onamonapoea 2021-05-30 15:45:11 -04:00
Novacat
0bd9a33b41 Merge pull request #10437 from Novacat/nova-basicfixes 
Nerfs Storage Briefcases
 2021-05-29 15:53:09 -04:00
Unknown
3a5552cb4b Fixes Oversight 2021-05-29 15:42:18 -04:00
Unknown
e82a02e016 Update 2021-05-29 15:41:29 -04:00
Novacat
21658b8d85 Merge pull request #10401 from VOREStation/upstream-merge-8075 
[MIRROR] Reverts recipe changes from Industrial Expansion
 2021-05-27 13:16:06 -04:00
Aronai Sieyes
4cfdd72c02 VS: Strange incorrect code times 2021-05-27 12:07:41 -04:00
Unknown
8470030adc Nerfs Storage Briefcases 
Station ML3M/NSFW briefcases are now itemsize_huge (cannot fit in bags)
Non-station multi-cells are itemsize_large (takes up twice the current amount of space)
 2021-05-26 13:42:36 -04:00
Neerti
767e655310 Linter Introduction + Cleanup 2021-05-25 23:19:34 -04:00
Atermonera
e3d239dab9 Merge pull request #8075 from Atermonera/revert_copper_recipes 
Reverts recipe changes from Industrial Expansion
 2021-05-23 15:41:50 -04:00
Atermonera
acd97ff613 Merge pull request #8094 from Hatterhat/pbore-buff 
phoron bore stock parts now affect range, along with other bits
 2021-05-23 15:40:29 -04:00
ShadowLarkens
1da76ed2b4 Personal Crafting & Dependencies 2021-05-02 18:10:59 -07:00
Unknown
d8d3a2b53c Minor Fixes 
- Fixes giving uplinks not adminlogging
- Fixes Frontier sniper not having the correct initial projectile
- Replaces V4 solarfish with an Icebass
 2021-04-29 23:25:47 -04:00
Unknown
c1eeea9efc Exploration Balance Tweaks 
- Removes the Pathfinder's Frontier Carbine
- Removes the Pathfinder's Binoculars
- Adds the Frontier Carbine to the Survery Vendor, for 750 points. It has improved stats over a normal Frontier Phaser
- Adds binoculars to the survey vendor for 40 points
- Adds a Frontier Rifle, adminbus only for now
- Renames some frontier phaser sprites for additional clarity
- Adds two frontier holdout phasers to the exploration weapons locker
 2021-04-26 14:03:40 -04:00
klaasjared
8bb0607747 Fixes modifystate for phaser and carbine 2021-04-26 12:42:16 -04:00
klaasjared
08f81afec1 fixes in_hand sprites 2021-04-26 12:14:34 -04:00
Unknown
e391898c59 Lets see if I can fix this 2021-04-26 11:46:50 -04:00
klaasjared
efd25b188e Revert "Merge branch 'The-Model-E2' of https://github.com/klaasjared/VOREStation into The-Model-E2" 
This reverts commit 4431137791, reversing
changes made to 1806f4dc60.
 2021-04-26 11:41:54 -04:00
Unknown
f928e65a87 Fixes up laser_vr because I forgot 2021-04-26 11:38:06 -04:00
Unknown
2e5737ee12 Fixes up this PR! 2021-04-26 11:34:58 -04:00
klaasjared
11c92a38ca Adds Surplus Rifle for Derelicts 
What it says in the title
 2021-04-26 02:07:10 -04:00
klaasjared
d213e25e35 Adds code and Sprites 
Adds the code and sprites for the retextured weapons and modifies them to work better...
 2021-04-25 02:20:05 -04:00
Atermonera
5b60e50ac4 Merge pull request #8037 from Novacat/nova-holowarrant 
Practice/Lasertag weapons no longer excavate
 2021-04-20 23:56:29 -04:00
Novacat
ba6a46808d Merge pull request #9800 from VOREStation/upstream-merge-7919 
[MIRROR] Hybridizes Point Defense Turrets with Bay's System
 2021-04-10 15:17:39 -04:00
Atermonera
20f4ff8384 Added think-tanks. 2021-03-18 04:09:42 -04:00
Unknown
e1d7458624 Merge remote-tracking branch 'VOREStation/master' into upstream-merge-7919 2021-03-09 19:32:09 -05:00
Unknown
190b805cad this sucks 2021-03-09 15:49:07 -05:00