cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-02 04:10:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
37,018 Commits 8 Branches 26 Tags
357e8491c0c557c7ffdfd544f6b47be8e4e86a16
Commit Graph

27413 Commits

Author SHA1 Message Date
Spades
357e8491c0 Merge remote-tracking branch 'refs/remotes/origin/master' into gateway-stoof 2017-07-04 20:04:19 -04:00
Spades
0540593119 Final additions and fixes 2017-07-04 20:01:38 -04:00
Spades
8b0f91f35b Merge pull request #1798 from VOREStation/Revolver 
Spawns Detectives with a .38 revolver.
 2017-07-04 15:24:25 -04:00
RezRaz
96fec7a66a Add files via upload 2017-07-04 14:14:58 -05:00
Spades
0ece205fc3 Merge remote-tracking branch 'refs/remotes/origin/master' into gateway-stoof 2017-07-04 13:15:00 -04:00
Spades
4367bc2da7 sleepy commit 2017-07-04 06:38:32 -04:00
Spades
627dbb9566 Fixes various otie problems 2017-07-04 02:38:44 -04:00
Cyantime
5c6bb120a6 Fix missing pike icon 2017-07-03 19:11:14 -04:00
Spades
4da487d547 Spawns Detectives with a .38 revolver. 
At some point I'll make it possible to pick different skins on your
revolver. You at least get this for now.
 2017-07-02 15:34:44 -04:00
Spades
74b3a971ac Merge remote-tracking branch 'refs/remotes/origin/master' into gateway-stoof 2017-07-02 12:49:29 -04:00
killer653
c97ded0da9 Adds in Icowom's custom items 
Resolves #1695
 2017-07-02 03:21:48 -04:00
Spades
87fa10e48e Merge pull request #1794 from Cyantime/koi 
Improves koi
 2017-07-02 02:29:57 -04:00
Spades
08704251b2 Merge pull request #1793 from VOREStation/guns 
Dakka Dakka
 2017-07-02 02:29:46 -04:00
Spades
7aa6ab1ff8 Merge pull request #1788 from Cyantime/transferrefactor 
Splits some things into seperate procs
 2017-07-02 02:20:39 -04:00
Spades
36f32b1ab6 Merge pull request #1756 from Verkister/cargoandborgo 
Cargo and borgo stuffs. [change check a whole week overdue!]
 2017-07-02 02:20:25 -04:00
Spades
2f9c8b48b4 Merge remote-tracking branch 'refs/remotes/origin/master' into guns 2017-07-02 00:30:23 -04:00
Spades
6af39bea3f Trying to make a syndie base 2017-07-02 00:28:19 -04:00
Cyantime
1a7e8a9878 koi upgrades 2017-07-01 15:07:07 -04:00
Spades
3db35eb684 Dakka Dakka 
- Removed gun_vr judge, Polaris has one now.
- Removed vorestation m44 mags, Polaris has those now.
- Removed detective's .44 magnum because NO YOU CANNOT HAVE A FUCKING
MAGNUM
- Corrected inconsistent naming of .44 speedloaders
- Corrected inconsistent naming of .357 speedloaders
- Fixed broken calibers for .357 stuff to be consistent with upcoming
Polaris sync.
 2017-06-30 22:42:08 -04:00
Leshana
1507a0330c Fixes ammo paths changed by PolarisSS13/Polaris/pull/3541 in VOREStation custom code. 2017-06-30 22:34:15 -04:00
Leshana
18b1828631 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-20170630 2017-06-30 22:31:43 -04:00
Cameron653
1a9546f8ab Merge pull request #1740 from Cameron653/master 
Adds Rosey's fluffy tails
 2017-06-29 19:09:34 -04:00
Leshana
844d81b8be Merge pull request #1763 from VOREStation/ss-lighting 
Converts the lighting process controller to a StonedMC subsystem
 2017-06-28 22:50:59 -04:00
Cyantime
ba114dcf7a transfer&taste procs 2017-06-27 16:23:00 -04:00
Leshana
be3665853f Merge pull request #1780 from Cyantime/examinetext 
Enables %pred and %prey macros in full belly examine text
 2017-06-27 01:34:55 -04:00
Andrew
3a089ab8a6 Merge branch 'master' into master 2017-06-25 18:10:33 -05:00
Anewbe
2dd8f33ecd Merge pull request #3543 from Neerti/6/24/2017_aooc_for_nonadmins 
Adds AOOC functionality for antags.
 2017-06-25 16:34:15 -05:00
Anewbe
b3f294efd2 Merge pull request #3523 from Yoshax/whythehellisthislikethisandwhydidnobodymentionitbefore 
Nerfs the siemens on most hardsuits
 2017-06-25 16:30:06 -05:00
Anewbe
81e7d9ce42 Merge pull request #3513 from Belsima/snowsuit 
Adds snowsuits.
 2017-06-25 16:27:43 -05:00
Anewbe
12be304ba4 Merge pull request #3528 from VOREStation/aro-pol-defibs 
Ports Bay/Paradise Defibs
 2017-06-25 16:15:01 -05:00
Anewbe
004fb13a67 Merge pull request #3544 from Neerti/6/24/2017_kick_the_admins 
Removes staff exemption for AFK kicking.
 2017-06-25 13:15:05 -05:00
Anewbe
a5f0569a2d Merge pull request #3541 from SpadesNeil/AcesFixesThingses 
More Munition Caliber Naming Fixes
 2017-06-25 13:14:18 -05:00
Cyantime
ad0c5be5f6 fixes "aglae" 2017-06-24 23:20:33 -04:00
Neerti
795fcd6306 Fixes Inability to use Say/LOOC/Other Things 
A null entry somehow got into ```player_list```, which caused an important proc called ```get_mobs_and_objs_in_view_fast()``` to fail.  The cause appeared to be a brain mob failing to qdel, then failing to ```logout()```, leaving a null entry in ```player_list```.
```get_mobs_and_objs_in_view_fast()``` now makes sure every entry it iterates over exists, and this should fix the qdel issue as well.
 2017-06-24 18:18:10 -04:00
Neerti
7bd7e83250 Removes staff exemption for AFK kicking. 
As requested by a few staff members, this serves to keep the staffwho list more representative of who is actually available to help.
The current inactivity timer is rather generous so hopefully this won't impede admins who are actually there.
 2017-06-24 15:15:11 -04:00
Anewbe
2bd869026a Merge pull request #3534 from Neerti/6/13/2017_infiltrators 
Adds a new Infiltrator Gamemode (Team Traitor)
 2017-06-24 12:32:16 -05:00
Neerti
1cfd2f08f2 Adds AOOC functionality for antags. 
AOOC can be granted on a per-antag type basis.  If the type has can_use_aooc equal to true, they can both use and see AOOC.  It is true by default to allow for the upcoming Infiltrator type to automatically be able to use it.
The types disallowed from AOOC are ERT, Traders, and Renegades.  This means admins can now use AOOC to talk to the real antags and not the ERT.
 2017-06-24 12:31:18 -04:00
Cyantime
a8e2cd5214 Enables %pred and %prey macros in full belly examine text 2017-06-23 11:47:01 -04:00
Verkister
e2c749288d A shave. 
-Replaced unnecessary fluff mentions with something else.
 2017-06-23 09:56:24 +03:00
Verkister
0499fec8b8 Minor adjustments. 
-Small health nerf for unarmored oties.
-Comment blabbery.
-Halved crate chance for the cosmetic difference oties (like the bears do I think?)
 2017-06-23 09:25:24 +03:00
Screemonster
bf695ef397 forgot some 2017-06-20 10:23:52 +01:00
Screemonster
47b2d379a4 fixes markings, adds hairstyle options to chimera 2017-06-20 10:21:37 +01:00
Spades
ee7c895d07 Merge pull request #1767 from VOREStation/HoS-Nerf 
HoS gear nerf
 2017-06-20 01:24:31 -04:00
Spades
3bbc518978 Merge pull request #1752 from VOREStation/aro-nonlethals 
KHI-102b "NSFW" Handgun
 2017-06-20 01:21:12 -04:00
Spades
21889e4991 One more because I forgot to click save 2017-06-20 01:15:12 -04:00
Spades
3da257d984 Merge remote-tracking branch 'refs/remotes/PolarisSS13/master' into AcesFixesThingses 2017-06-20 01:04:22 -04:00
Spades
79e192f565 Missed a few things. 2017-06-20 01:04:07 -04:00
Neerti
12543dd138 Merge pull request #3537 from Cameron653/AHF 
Makes artifact_harvesters have a detection delay on spawn
 2017-06-20 01:01:41 -04:00
Neerti
2e1ae6f49f Merge pull request #3538 from Cameron653/BDF 
Blast Door repair & damage fix
 2017-06-20 00:59:16 -04:00
Neerti
5d9a91df63 Merge pull request #3510 from FTangSteve/engieBorg 
Ports inflatable dispensers from Bay
 2017-06-20 00:56:23 -04:00