cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-05 05:40:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,520 Commits 8 Branches 26 Tags
abb4a58ee1bdd2b5ceadce7a331e2b68f464beeb
Commit Graph

28447 Commits

Author SHA1 Message Date
Cameron653
abb4a58ee1 Update custom_clothes_vr.dm 2017-09-24 13:45:04 -04:00
Spades
fff80559ac Merge pull request #2201 from Ketrai/patch-2 
fixes smol bug
 2017-09-24 13:18:33 -04:00
Spades
a0480d0d42 Merge pull request #2191 from VOREStation/NIF_EXAMINE_FIX 
Fixes NIF examine
 2017-09-24 13:17:31 -04:00
Ketrai
e79f1f6534 fixes smol bug 2017-09-24 18:39:44 +02:00
Spades
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
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
Cameron653
0cd5efd1eb Fixes NIF examine 
Exactly what it says on the tin.
 2017-09-23 01:08:08 -04:00
Spades
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
Cameron653
0832710cc4 Disables grubs until somewhat reworked 2017-09-22 23:42:01 -04:00
Cameron653
ec20b76ab8 Adds a second dose of the poison & lowers chance 2017-09-22 23:36:45 -04:00
Ketrai
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
killer653
2755d3ddb1 HOTFIX 2017-09-21 20:26:48 -04:00
Spades
21991ee816 Merge pull request #2153 from Cameron653/SIZECHANGE_OOC 
Reenables size changing.
 2017-09-21 20:00:17 -04:00
Spades
d2b8db26c1 Merge pull request #2148 from Cameron653/NUMBING_BITE_V2 
Numbing bite v2
 2017-09-21 19:47:17 -04: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
Neerti
3bce4ed285 Merge pull request #3893 from Anewbe/bioprinter 
Improves the bioprinter
 2017-09-21 00:58:41 -04:00
Anewbe
61936496b1 Merge pull request #3813 from Belsima/clickityclack 
Adds a metric assload of sounds.
 2017-09-20 22:20:17 -05:00
Belsima
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
Belsima
1c2c5833f9 Adds a bunch of dreams. (#3888) 
* Adds a bunch of dreams.

* fix

* maintaining connection

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

* fuck i didnt indent

* Adds syllables from latin.
 2017-09-20 12:57:11 -05:00
Anewbe
1431ac5148 Merge pull request #3891 from MisterLayne/9/19/2017_Rainbow_Slime_Fix 
Rainbow Slime Fix
 2017-09-20 12:11:01 -05:00
Spades
91982d3c01 Merge pull request #2170 from VOREStation/trash-pile-tweaks 
Trash pile tweaks
 2017-09-20 00:18:54 -04:00
Neerti
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
Anewbe
b633d35104 Merge pull request #3880 from Belsima/pro-lathe 
Xenoarch adjustments.
 2017-09-19 21:04:48 -05:00
Anewbe
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
Anewbe
9fe2ba0743 Merge pull request #3863 from Belsima/master 
Adds sounds to opening/closing firelocks.
 2017-09-19 21:00:10 -05:00
Anewbe
e01cbf4f02 Merge pull request #3861 from Belsima/hair 
Adds a bunch of new hair styles.
 2017-09-19 20:59:08 -05:00
Anewbe
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
MisterLayne
cfdb777a13 Fixes Rainbow Slime Antagonism 2017-09-19 20:57:11 -04:00
Spades
668e718dcb Merge pull request #2169 from stobarico/Custom 
Adds Alexis's ancient wand
 2017-09-19 19:22:31 -04:00
Neerti
992101bbf4 Merge pull request #3868 from Anewbe/gamemaster_part_one 
Adds an event_manager chat channel
 2017-09-19 18:21:55 -04:00
Neerti
6311e663a1 Merge pull request #3882 from Anewbe/ghost_rune_chat 
Should let ghosts see communicate rune chat again.
 2017-09-19 03:27:40 -04:00
Anewbe
79581c5341 Merge pull request #3877 from Neerti/9/17/2017_trash_pile_port 
Ports Trashpiles
 2017-09-19 01:26:20 -05:00
stobarico
5ef1f50163 Fixes last line 
Duplicate, forgot to take that off after editing the code
 2017-09-18 18:32:15 -03:00
stobarico
67b3660521 De-spawns sparks 
yis
 2017-09-18 16:42:59 -03:00
Anewbe
fb3b5864b6 Space Lube dries off eventually 2017-09-18 14:31:07 -05:00
Anewbe
649ca6d53a Should let ghosts see communicate rune chat again. 2017-09-18 14:03:46 -05:00
Anewbe
1894dc7060 Merge pull request #3857 from Neerti/9/17/2017_slime_update 
Slime Update
 2017-09-18 11:49:22 -05:00
Anewbe
1ff1eb5e88 Merge pull request #3825 from Neerti/9/12/2017_fire_unbugged 
Makes Fire Hot Again
 2017-09-18 11:22:04 -05:00
Anewbe
4b201ca6ec Merge pull request #3845 from Woodratt/09162017_RailingsnCatwalks 
Catwalks and Railings
 2017-09-18 11:10:15 -05:00
Mechoid
17dfae4020 Tweaks Xenomorph spitting. (#3852) 
* Tweaks Xenomorph spitting.

* Swap 'them' for 'the target'. ..Also fixes the mismatched costs.

* Swaps 'them' for 'the target'. Also, in-progress fixing phoron costs of acid.

* Fixes the acid phoron cost. Because Git wasn't playing nice. AAAAAAA.

* Swaps a long line out for a small check.
 2017-09-18 11:03:04 -05:00
Belsima
e94e375cd5 Adds nicotine to cigarettes. (#3856) 
* Adds nicotine to cigarettes.

* Fixes pathing.

* Adjusts the volume of nicotine added.

* satisfies the lord travis

* Better way of adding nicotine to cigs.
 2017-09-18 11:02:51 -05:00
Belsima
69b09d859b Xenoarch adjustments. 2017-09-18 11:15:14 -04:00
Belsima
18346b864a The new default for 'if you don't get your job' is assistant. 2017-09-18 10:15:06 -04:00
Neerti
1c264176d9 Ports Trashpiles 
Mostly ports Vore's Trashpile code, and made more generic, as I plan to use these for surface loot later.
Adds mold reagent to give a consequence to eating food you found in the garbage.
These aren't mapped in but I or someone else can do that later.
 2017-09-18 06:34:10 -04:00
Neerti
835148250c Comments out fire spreading pending discussion in the future. Hopefully. 2017-09-18 04:48:43 -04:00
Spades
2ff8f3b0e1 Response to feedback 
Dart gun is back, voice changer is gone (from this list)
 2017-09-18 03:59:06 -04:00