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

28471 Commits

Author SHA1 Message Date
Ketrai
4e18420052 amazing 2017-09-28 15:06:03 +02:00
Ketrai
46a0c4efde fixes format 2017-09-28 14:25:51 +02:00
Ketrai
7ec99a0d26 Allows nom on bumb behavoir for solargrubs 
Went with the proposed 50% to try and eat people if you bump into them.
 2017-09-28 07:23:27 +02:00
killer653
18a2ba8ed8 Quick fix to get rid of warnings on compile. 2017-09-27 21:01:48 -04:00
Spades
f1cfb91108 Merge pull request #2200 from VOREStation/Cameron653-patch-1 
Bumps borgs up by one.
 2017-09-27 20:24:49 -04:00
Spades
b23ceee403 Merge pull request #2212 from Yewmi/eldi-fluff 
Adds Eldi's fluff reagent implant
 2017-09-27 20:23:57 -04:00
Spades
bda518fd8b Merge pull request #2207 from Cameron653/BYONDMYLIFE_CLOTHES 
Byondmylife clothes
 2017-09-27 20:23:04 -04:00
Spades
13071d2266 Merge pull request #2194 from Cameron653/PERMA_GURGLES 
Variable gurgle damage.
 2017-09-27 20:22:41 -04:00
Spades
7132a04b02 Merge pull request #2193 from Screemonster/pouncecritters 
Adds nom-on-bump behaviour
 2017-09-27 20:22:21 -04:00
Cyantime
c77c81b797 Stops size_steal mode from shrinking the user. 2017-09-27 14:55:08 -04:00
killer653
8e0f08d43b Forgot this 2017-09-26 18:18:33 -04:00
killer653
833fe7a75f BeyondMyLife: Ne'tra Ky'ram fluff 
https://forum.vore-station.net/viewtopic.php?f=26&t=1117&sid=1451fde8eebda775f37a397f5cd50e79

https://forum.vore-station.net/viewtopic.php?f=26&t=1116&sid=1451fde8eebda775f37a397f5cd50e79

https://forum.vore-station.net/viewtopic.php?f=26&t=1115&sid=1451fde8eebda775f37a397f5cd50e79
 2017-09-26 18:14:40 -04:00
Cameron653
0286b6878f Update vorepanel_vr.dm 2017-09-24 16:34:30 -04:00
Spades
d97c769361 Merge pull request #2197 from Ketrai/patch-1 
Makes grubs capable of shocking synths.
 2017-09-24 14:03:43 -04:00
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
Cameron653
c4f2c62245 Bumps borgs up by one. 
https://i.imgur.com/X7MIKPZ.png
 2017-09-24 11:28:46 -04:00
Cameron653
c233bb9848 Update vorepanel_vr.dm 2017-09-24 11:23:41 -04: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
Ketrai
8076c68f14 also adds itemfriendly digestion to grubs 2017-09-23 23:26:44 +02:00
Ketrai
b8b14c6921 Makes grubs capable of shocking synths. 
Gives grubs a 20% change to emp a synth weakly. This is supposed to give grubs a leg up on synths that are usually quite robust when it comes to fighting mobs in general, especially when it comes to spiders.
 2017-09-23 22:53:02 +02:00
Cameron653
f3a9c3ee5d THERE 2017-09-23 16:07:24 -04:00
killer653
9023caa970 Merge remote-tracking branch 'refs/remotes/VOREStation/master' into PERMA_GURGLES 2017-09-23 05:51:58 -04:00
killer653
b3798b244e Allows stomach damage to be adjusted 2017-09-23 05:51:23 -04:00
Screemonster
3e6d9f9d67 add ckey check and fix order of procs for micro interactions 2017-09-23 10:37:02 +01:00
Cyantime
06d089b222 What's testing 2017-09-23 03:55:05 -04:00
Screemonster
2714ce73f7 Adds nom-on-bump behaviour 2017-09-23 08:25:17 +01: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