cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-30 23:49:21 +01:00
Code Issues Packages Projects Releases Wiki Activity
38,520 Commits 9 Branches 26 Tags
abb4a58ee1bdd2b5ceadce7a331e2b68f464beeb
Commit Graph
38520 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Cameron653andGitHub abb4a58ee1 Update custom_clothes_vr.dm 2017-09-24 13:45:04 -04:00
SpadesandGitHub fff80559ac Merge pull request #2201 from Ketrai/patch-2 
fixes smol bug
 2017-09-24 13:18:33 -04:00
SpadesandGitHub a0480d0d42 Merge pull request #2191 from VOREStation/NIF_EXAMINE_FIX 
Fixes NIF examine
 2017-09-24 13:17:31 -04:00
KetraiandGitHub e79f1f6534 fixes smol bug 2017-09-24 18:39:44 +02:00
SpadesandGitHub 6c53a33718 Merge pull request #2198 from VOREStation/space-asshole 
Removed stupid titles from Clown and Mime
 2017-09-24 03:04:37 -04:00
Spades b690467f1f Removed stupid titles from Clown and Mime 
Clown and Mime are memey enough. We need to keep _some_ semblance of
immersion.

Also fixed CentCom capitalization while I was at it.
 2017-09-23 22:19:01 -04:00
Cameron653andGitHub fc1f983297 Merge pull request #2192 from Cyantime/awakebumps 
Fixes the dead running into walls and disposal bins.
 2017-09-23 05:23:41 -04:00
Cyantime 06d089b222 What's testing 2017-09-23 03:55:05 -04:00
Cyantime eb3c898111 Fixes the dead running into walls and disposal bins. 2017-09-23 01:52:06 -04:00
Cameron653andGitHub 0cd5efd1eb Fixes NIF examine 
Exactly what it says on the tin.
 2017-09-23 01:08:08 -04:00
SpadesandGitHub 0dda4ff127 Merge pull request #2189 from Cameron653/SOLAR_GRUB_FIX 
Removes a second dose of the poison & lowers chance
 2017-09-23 00:39:42 -04:00
SpadesandGitHub df65d3aca9 Merge pull request #2190 from VOREStation/DISABLES_GRUBS 
Disables grubs until somewhat reworked
 2017-09-23 00:39:31 -04:00
Cameron653andGitHub 0832710cc4 Disables grubs until somewhat reworked 2017-09-22 23:42:01 -04:00
Cameron653andGitHub ec20b76ab8 Adds a second dose of the poison & lowers chance 2017-09-22 23:36:45 -04:00
SpadesandGitHub f81900c150 Merge pull request #2183 from VOREStation/more-map-tweaks 
Map tweaks
 2017-09-22 13:42:05 -04:00
SpadesandGitHub f341d03569 Merge pull request #2185 from Ketrai/patch-1 
Nerfs shockchem.
 2017-09-22 13:41:54 -04:00
KetraiandGitHub 5f42d335fc Nerfs shockchem. 
Bumps down the potency of grub shockchems to accommodate the change made to the passive heals.
 2017-09-22 13:18:55 +02:00
Spades 11f414306f Map tweaks 
- Adds a big scrubber to the bar
- Removes a broken air vent
- Tweaks the game table in the bar and adds some game stuff
 2017-09-21 21:29:11 -04:00
Cameron653andGitHub 4faebdc450 Merge pull request #2181 from Cameron653/master 
Hotfix
 2017-09-21 20:39:36 -04:00
killer653 2755d3ddb1 HOTFIX 2017-09-21 20:26:48 -04:00
SpadesandGitHub 21991ee816 Merge pull request #2153 from Cameron653/SIZECHANGE_OOC 
Reenables size changing.
 2017-09-21 20:00:17 -04:00
SpadesandGitHub d2b8db26c1 Merge pull request #2148 from Cameron653/NUMBING_BITE_V2 
Numbing bite v2
 2017-09-21 19:47:17 -04:00
SpadesandGitHub a9e6611c4c Merge pull request #2176 from VOREStation/gun-tweaks 
Some disorganizes changes by Aces
 2017-09-21 19:41:29 -04:00
SpadesandGitHub ac3b0f8e04 Merge pull request #2179 from Cyantime/scrubnet 
Reconnects surface 3 to scrubber network.
 2017-09-21 19:41:00 -04:00
Cyantime b23dad3689 Reconnects surface 3 to scrubber network. 2017-09-21 19:00:45 -04:00
Cameron653andGitHub 562d75afb1 Merge pull request #2178 from Draycu/master 
Theseus' Diamond Coin Fluff Item
 2017-09-21 17:59:32 -04:00
DraycuandGitHub 5da77f7940 Merge pull request #1 from Draycu/Theseus-patch-1 
Diamond Coin Item Request
 2017-09-21 15:08:26 -05:00
Spades 07762f31e7 Some disorganizes changes by Aces 
- UNSC is now USDF.
- .32 is now .380 instead.
- Added giskard to random gun spawns.
- Changed oliva to be a subtype of giskard.
- Rebalanced random gun spawner and added things.
- Detective no longer spawns with a pistol. It's in your locker instead.
- `SMG_sol` is now just `sol`.
- Fixed some ammo pathing to be consistent.
- Moves Asset Protection spawn point inside the big armory at CentCom.
- Adds a door in CentCom to let the ERT area actually be reached from
CentCom's bridge.
 2017-09-21 03:22:20 -04:00
NeertiandGitHub 3bce4ed285 Merge pull request #3893 from Anewbe/bioprinter 
Improves the bioprinter
 2017-09-21 00:58:41 -04:00
AnewbeandGitHub 61936496b1 Merge pull request #3813 from Belsima/clickityclack 
Adds a metric assload of sounds.
 2017-09-20 22:20:17 -05:00
BelsimaandAnewbe c67865ac63 Adds a load of new FBPs. (#3850) 
* Adds a load of new FBPs.

* Replaces cyber solutions sprites.

* Fixes and price adjustments.

* Revert "Fixes and price adjustments."

This reverts commit d56c3f082e9301b80970f62aa9d0cb3e8cfc6d8f.

* Fixes + supply price adjustments.

This time without... for some reason adding an empty line to the map
files. Not sure how that got caught by Git.

* Makes the new knockoffs into alternatives for the currently existing brands.

* new names
 2017-09-20 22:02:18 -05:00
BelsimaandAnewbe 1c2c5833f9 Adds a bunch of dreams. (#3888) 
* Adds a bunch of dreams.

* fix

* maintaining connection

* capitalism
 2017-09-20 13:51:14 -05:00
BelsimaandAnewbe b95828d8e8 Changes Tradeband syllables. (#3879) 
* Replaces tradeband syllables.

* fuck i didnt indent

* Adds syllables from latin.
 2017-09-20 12:57:11 -05:00
SpadesandGitHub 2bafa74d90 Merge pull request #2175 from stobarico/patch-2 
Update custom_items.txt
 2017-09-20 13:50:08 -04:00
AnewbeandGitHub 1431ac5148 Merge pull request #3891 from MisterLayne/9/19/2017_Rainbow_Slime_Fix 
Rainbow Slime Fix
 2017-09-20 12:11:01 -05:00
stobaricoandGitHub a5a2454518 Update custom_items.txt 2017-09-20 12:02:17 -03:00
SpadesandGitHub 91982d3c01 Merge pull request #2170 from VOREStation/trash-pile-tweaks 
Trash pile tweaks
 2017-09-20 00:18:54 -04:00
SpadesandGitHub f058f42d3b Merge pull request #2174 from stobarico/patch-1 
Assigns Alexis's wand
 2017-09-20 00:18:37 -04:00
NeertiandGitHub afaa029b2b Merge pull request #3875 from Anewbe/frost_spider 
Adds the Frost Spider. Starts support for more complicated spiderlings.
 2017-09-20 00:18:10 -04:00
stobaricoandGitHub 3fa0cbbec5 Assigns Alexis's wand 
Can't explain better, can i?

#2169
 2017-09-19 23:43:17 -03:00
AnewbeandGitHub b633d35104 Merge pull request #3880 from Belsima/pro-lathe 
Xenoarch adjustments.
 2017-09-19 21:04:48 -05:00
AnewbeandGitHub deb6ef9152 Merge pull request #3867 from Belsima/display 
thiccens status display
 2017-09-19 21:01:18 -05:00
AnewbeandGitHub c3fab6a182 Merge pull request #3881 from Belsima/pAI 
Adds directional sprites for borgi and fox rests.
 2017-09-19 21:00:55 -05:00
AnewbeandGitHub d3cf04dbef Merge pull request #3878 from Belsima/oopsmygoopiscaptainagain 
The default for if your job is unavailable is assistant.
 2017-09-19 21:00:48 -05:00
AnewbeandGitHub 9fe2ba0743 Merge pull request #3863 from Belsima/master 
Adds sounds to opening/closing firelocks.
 2017-09-19 21:00:10 -05:00
AnewbeandGitHub 16ff88ff37 Merge pull request #3865 from Belsima/beltsprite 
Replaces utility belt on mob sprites.
 2017-09-19 20:59:32 -05:00
AnewbeandGitHub e01cbf4f02 Merge pull request #3861 from Belsima/hair 
Adds a bunch of new hair styles.
 2017-09-19 20:59:08 -05:00
AnewbeandGitHub 47457c7067 Merge pull request #3862 from Belsima/botcomps 
Replaces robot component sprites with some from the Eris.
 2017-09-19 20:58:45 -05:00
AnewbeandGitHub 0c200a312b Merge pull request #3828 from Belsima/xenospritz 
Replaces xeno sprites with cooler and darker ones.
 2017-09-19 20:56:53 -05:00
Anewbe 3beca956a0 Improves the bioprinter 2017-09-19 20:18:13 -05:00