cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-01-31 11:22:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
57,497 Commits 8 Branches 26 Tags
b29638cefdf0c8f18ecac843d9c84ee5ea3ee017
Commit Graph

26983 Commits

Author SHA1 Message Date
klaasjared
b29638cefd Spelling Fix 4 
Co-authored-by: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com>
 2021-04-27 17:43:07 -04:00
klaasjared
2d1f695f9c Spelling Fix 3 
Co-authored-by: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com>
 2021-04-27 17:42:59 -04:00
klaasjared
6a2566ea5b Spelling Fix 1 
Co-authored-by: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com>
 2021-04-27 17:42:44 -04:00
klaasjared
dbb8352ec0 Adds Snek Lore 
SSSSSSsssssss
 2021-04-27 15:38:08 -04:00
klaasjared
fd61a288b0 More minor fixes 
*eternal screaming*
 2021-04-27 15:29:15 -04:00
klaasjared
a3fdbc2873 hey, another fix 2021-04-27 15:12:48 -04:00
klaasjared
2a3199ca2e Adds Rat Lore 
rat rat rat rat rat rat rat rat rat
 2021-04-27 15:09:40 -04:00
klaasjared
d9b2b5e782 Fixes the Spaces 
*gestures at the title*
 2021-04-27 15:09:16 -04:00
klaasjared
9eabf63c72 fixed someone's error 
Someone used space instead of tab - I want to screm
 2021-04-27 13:22:45 -04:00
klaasjared
6471e1e650 even MOAR tiny fix 
adds `catalogue_data =` to each mob changed...
 2021-04-27 13:07:36 -04:00
klaasjared
b1a19a8a0c moar tiny fix 
forgot to change the datum/
 2021-04-27 12:59:21 -04:00
klaasjared
8f32c912e7 Tiny fix 
Forgot the Deathclaw scientific name.
 2021-04-27 12:50:38 -04:00
klaasjared
ce86065ce0 Adds Lore 
Adds Cataloguer lore that needed to be done for a while now...
 2021-04-27 12:48:39 -04:00
Novacat
8b8c3c55eb Merge pull request #10217 from ResidentCody/Personal-Fork 
Add LUNA's Medals
 2021-04-27 00:18:59 -04:00
ResidentCody
c312aac93c Update loadout_fluffitems_vr.dm 2021-04-26 22:02:02 -06:00
Little-119
7f961dd4aa Update loadout_fluffitems_vr.dm 2021-04-26 19:47:06 -04:00
Heroman
2bee350ae3 Both fixes and comments out WL check 2021-04-27 04:36:32 +10:00
Novacat
118c0861ac Merge pull request #10210 from Novacat/nova-basicfixes 
Exploration Balance Tweaks
 2021-04-26 14:13:17 -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
Cerebulon
d1038c43b9 Brings back old tesh radsuit sprites, adds 'fitted' version. (#7995) 
* Brings back old tesh radsuit sprites, adds 'fitted' version.

* removed superfluous fitted grondsprite

* Conflicts with teshari path changes resolved
 2021-04-26 13:29:58 -04:00
Novacat
7e0f0ef92c Merge pull request #10207 from klaasjared/The-Model-E2 
The Armory V1
 2021-04-26 12:51:51 -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
Unknown
b0059ec1be Makes blobform less robust 
Requested by Staff
 2021-04-26 10:46:24 -04:00
klaasjared
a4f93a94b8 Removes Chemsprayer Sprite 
Moved to a new branch for further tweaks
 2021-04-26 02:15:37 -04:00
klaasjared
11c92a38ca Adds Surplus Rifle for Derelicts 
What it says in the title
 2021-04-26 02:07:10 -04:00
Atermonera
48a6baff4b Merge pull request #8047 from Verkister/patch-70 
Makes xenowear species WL check for species instead of ckey
 2021-04-25 14:24:51 -04:00
klaasjared
50371d3a37 Adds Chemsprayer in_hand sprites 
Adds and codes chemsprayer in hand sprites
 2021-04-25 10:19:54 -04:00
klaasjared
b9eca49a9d Adds new Chemsprayer 
What it says in the title - still need an in_hand sprite though
 2021-04-25 02:24:31 -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
Novacat
4b22c80a5c Merge pull request #10202 from Verkister/patch-48 
Fixes voremob icon updates messing with scaling
 2021-04-25 00:40:29 -04:00
Verkister
63023683e2 Fixes voremob icon updates messing with scaling 2021-04-24 14:49:33 +03:00
klaasjared
175d9c3721 Drink Overhaul V1.2 (#8041) 
* Adds Sprites

Adds the new bottled sprites for soda as well as some other additional drink sprites

* Added code and organization

Adds the code that'll modify the bottles as well as organizes the code that already exists

* Whoops - minor sprite error

Fixed the Schnapps sprites - forgot to change the 'alpha' of some pixels
 2021-04-24 01:40:20 -04:00
Novacat
828f6a31bb Merge pull request #10179 from VOREStation/upstream-merge-8013 
[MIRROR] Oops, I refactored Chemistry!
 2021-04-23 22:25:33 -04:00
Unknown
3c8efc3787 Compatibility 2 2021-04-22 22:52:49 -04:00
Unknown
81a9b59c46 Compatibility Patch 1 2021-04-22 22:41:27 -04:00
Novacat
9c6730b69c Update rdconsole.dm 2021-04-22 10:11:42 -04:00
Novacat
89cd974e6a Merge pull request #10191 from dwinters99/cigfix 
AlFalah fluff item fix part 2
 2021-04-21 23:47:22 -04:00
David Winters
70244cdbe9 i fricked up again 2021-04-21 23:29:14 -04:00
Aronai Sieyes
7d548c4179 Fix message spam when looking at book list 2021-04-21 11:35:41 -04:00
Novacat
78260ac455 Merge pull request #10186 from VOREStation/upstream-merge-8038 
[MIRROR] Lying on the ground can be left or right
 2021-04-21 02:47:10 -04:00
Novacat
3d4cc34840 Update update_icons.dm 2021-04-21 02:31:56 -04:00
Novacat
5decd031a3 Merge pull request #10185 from VOREStation/upstream-merge-8037 
[MIRROR] Practice/Lasertag weapons no longer excavate
 2021-04-21 02:30:54 -04:00
Nyks
9501ea6c53 Cleaned upstream mirror 2021-04-21 08:45:30 +03:00
Atermonera
1de6aa74cf Lying on the ground can be left or right 2021-04-20 23:57:44 -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