cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-19 01:58:34 +01:00
Code Issues Packages Projects Releases Wiki Activity
52,035 Commits 9 Branches 26 Tags
577fc584bb653b074cf74db713dcb577b2f7452f
Commit Graph
1474 Commits
Author SHA1 Message Date
NovacatandGitHub 7768216c64 Merge pull request #4801 from VOREStation/upstream-merge-5974 
[MIRROR] Fixes departmental teshari cloaks and coats
 2019-03-28 21:09:51 -04:00
Unknown ad181e797a Conflict Resolution 
Also fixes a compiling error with previous PR
 2019-03-28 17:24:03 -04:00
elgeonmbandNovacat 9d056decda Adds the Zaddat Race + Modifies pressure damage calculations 2019-03-28 16:54:32 -04:00
NovacatandGitHub dce3466f3b Merge pull request #4684 from VOREStation/upstream-merge-5814 
[MIRROR] [READY]Makes a bunch of processes subsystems instead
 2019-03-27 17:46:31 -04:00
NovacatandGitHub 97e98dd04d Merge pull request #4682 from VOREStation/upstream-merge-5829 
[MIRROR] Ports TGstation view variables + admin proccall guards, and all the baggage that comes with it
 2019-03-27 16:37:45 -04:00
kevinz000andNovacat 6415e4193f [READY]Makes a bunch of processes subsystems instead 2019-03-27 16:03:51 -04:00
NovacatandGitHub b717399d21 Merge pull request #4681 from VOREStation/upstream-merge-5838 
[MIRROR] Fixes a couple of tiny glasses bugs
 2019-03-27 15:51:48 -04:00
Unknown 6636f1ba37 Conflict Resolution Part 2 2019-03-27 15:51:05 -04:00
NovacatandGitHub 1bbb64494e Merge pull request #4678 from VOREStation/upstream-merge-5835 
[MIRROR] Updates Religion Lists + Adds Religious Paraphernalia
 2019-03-27 15:19:15 -04:00
NovacatandGitHub d4f7e752eb Merge pull request #4675 from VOREStation/upstream-merge-5828 
[MIRROR] Fixes antagonist options not appearing in preferences
 2019-03-27 15:17:38 -04:00
NeertiandNovacat fe0b7373b3 Ports TGstation view variables + admin proccall guards, and all the baggage that comes with it 2019-03-27 14:49:30 -04:00
NovacatandGitHub f4aad05ea1 Merge branch 'master' into upstream-merge-5838 2019-03-27 14:26:19 -04:00
Unknown b3ee0e766f Why is this even a conflict. 2019-03-27 14:24:57 -04:00
kevinz000andNovacat dfbd0bd72b Upgrades SDQL2 and refactors it to a datum 2019-03-27 11:50:49 -04:00
Unknown 4e67e1b9ab Conflict Resolution 2019-03-27 04:11:30 -04:00
AnewbeandNovacat 09b01407e3 Adds Various Sounds, Looping Sound System 2019-03-27 03:55:21 -04:00
NovacatandGitHub 0b13775536 Merge pull request #4596 from VOREStation/upstream-merge-5783 
[MIRROR] Removes "allowed_roles" from Cloaks
 2019-03-27 03:03:09 -04:00
Unknown 893db47d9d Adds a mining veil for Mining. 2019-03-20 18:20:45 -04:00
Unknown 944babf622 Ports veils from Baystation 
Thought about kicking this to Polaris, but, pretty sure the Taj species maintainer would not be interested in them.

Might make some additional changes later, as I saw some problems with the code while making this.
 2019-03-20 16:57:07 -04:00
NeertiandVirgoBot e2557228dc Copy character slots 2019-03-08 20:17:46 -05:00
AtermoneraandVirgoBot bf7686cd02 Merge pull request #5992 from mistyLuminescence/turtlenecks 
Departmental Turtlenecks
 2019-03-08 01:45:09 -05:00
SpadesandGitHub 41bcb6a729 Merge pull request #4805 from Sebbe9123/master 
Changes vore egg_types to not interfere with mob egg_types.
 2019-03-02 08:03:58 -05:00
SpadesandGitHub 6e2172a5ae Merge branch 'master' into upstream-merge-5654 2019-03-01 05:42:07 -05:00
Sebbe9123andGitHub 22c9bd416e changes vore eggtype to not mess with mob eggtype 2019-02-25 12:03:07 +01:00
Heroman3003andVirgoBot 885fe76664 Fixes departmental teshari cloaks and coats (#5974) 
* Fixes departmental teshari clothes

Some missing vars, icons, misaligned qm undercoat, forgotten edits on some icon names.

* adjusted names and descriptions of departmental teshari cloaks

* Brought loadout entries to match existing ones.

* Puts RD on command tesh stuff WL, removes leftover comment

* Fixes a one-space typo in QM tesh cloak description.
 2019-02-24 17:15:30 -05:00
Unknown a4317b1910 [5654] Makes this PR Compile 
This one made me cry.
 2019-02-23 12:30:16 -05:00
SpadesandGitHub 14fad52791 Merge branch 'master' into upstream-merge-5744 2019-02-23 11:51:40 -05:00
AnewbeandVirgoBot 916e32e9eb Fixes a couple of tiny glasses bugs 2019-01-15 15:00:31 -05:00
SpadesandGitHub c6c7d98a2d Merge branch 'master' into upstream-merge-5735 2019-01-14 11:20:55 -05:00
NeertiandVirgoBot e1cf31c565 Merge pull request #5835 from Cerebulon/ReligionUpdate 
Updates Religion Lists + Adds Religious Paraphernalia
 2019-01-14 03:47:00 -05:00
NeertiandVirgoBot 5d102e8ed2 Merge pull request #5828 from Cerebulon/traitorFix 
Fixes antagonist options not appearing in preferences
 2019-01-13 00:29:09 -05:00
NaidhandVirgoBot 02ba929795 Removes "allowed_roles" from Cloaks (#5783) 
Department ponchos had this same line removed back in February as part of #4843 - now, the same is (hopefully) being done for cloaks.
 2018-12-18 21:19:18 -05:00
SpadesandGitHub 9b92dc1836 Merge pull request #4462 from Novacat/nova-basicfixes 
Expedition Job and Gear tweaks
 2018-12-08 09:44:15 -05:00
CerebulonandVirgoBot 0be6662dc5 Adds 12 new futuristic loadout clothing items + colour variants 2018-12-06 16:17:20 -05:00
AtermoneraandVirgoBot 2df5e9fe0e Merges AI Branch into Master 2018-12-01 00:06:38 -05:00
Unknown 98433abd03 Code cleanup 
Now with 75% Less //VOREStation Edit
 2018-11-18 14:28:40 -05:00
Unknown dcfecf6e85 Wrong file edited, loadouts configured proper 2018-11-05 20:00:31 -05:00
Unknown 433fa46ca8 Fixes some oversights 2018-11-05 14:23:35 -05:00
Aronai SieyesandGitHub aca8fa397e Merge pull request #4450 from VOREStation/upstream-merge-5692 
[MIRROR] Correctly fix surgery caps selection this time.
 2018-10-23 12:33:29 -04:00
AtermoneraandVirgoBot b2e676d216 Merge pull request #5692 from lbnesquik/Kates-Surgery-Fix 
Correctly fix surgery caps selection this time.
 2018-10-22 20:55:18 -04:00
ShophauneandVirgoBot 7266f28757 Fix for duplicated loadout descriptions (#5694) 
* Add files via upload

* Revert "Merge pull request #1 from Shophaune/plant-bag-ui-bug-fix"

This reverts commit 62a60d4f87774508621506b347c679191e1a242f, reversing
changes made to 6f909ce590.

* Borrowing Ibnesquik's descriptions to fix this issue quickly.
 2018-10-21 14:23:59 -04:00
NeertiandVirgoBot e019d0c8ef Fixes new record bug. (#5685) 2018-10-20 03:36:16 -04:00
AtermoneraandVirgoBot 54a24d244f Merge pull request #5657 from lbnesquik/Kates-Cap-Fix 
Move surgery caps into their own selection.
 2018-10-13 17:13:32 -04:00
Aronai SieyesandGitHub f9159296f9 Merge pull request #4358 from VOREStation/aro-traitstats 
Log trait and species usage for metrics
 2018-10-12 01:45:54 -04:00
Aronai SieyesandGitHub a5afd37e18 Merge pull request #4318 from lbnesquik/Kates-Nevrean-Fix 
Adds nevrean eggs.
 2018-10-11 23:15:12 -04:00
Arokha Sieyes ea0d6fc5a1 Log trait and species usage for metrics 
Just some stuff for use in building statistics about characters
 2018-10-11 20:49:33 -04:00
AnewbeandVirgoBot e4660c5838 Admin ticket system (for real this time) 2018-10-09 16:31:01 -04:00
lbnesquik 986dc248b0 Adds nevrean eggs. 2018-10-06 10:06:28 +02:00
Mewchild 19ed4485c1 Changes Secpatch Path in Loadout 2018-10-01 09:36:16 -05:00
SpadesandGitHub 587fd193a1 Merge pull request #4226 from Mewchild/MC-SecPatch 
Adds Security Eyepatch
 2018-10-01 09:20:37 -04:00