cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-03 12:50:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,137 Commits 9 Branches 26 Tags
ea41766ca9d1282d9adffc41e6e3ce1ca306ace4
Commit Graph

17909 Commits

Author SHA1 Message Date
Cameron653
ea41766ca9 Merge branch 'master' into NUMBING_BITE_V2 2017-09-10 19:23:52 -04:00
killer653
db3a941652 Adds numbing bite 2017-09-10 19:21:21 -04:00
Spades
c7124d458a Merge pull request #2129 from Cameron653/SHARP_MELEE_FIX 
Sharp melee fix
 2017-09-10 19:12:30 -04:00
Cyantime
5fd1cdc99b Fixes cyborg typing indicator. 2017-09-10 03:46:27 -04:00
killer653
944c6e7f57 Forgot to put a () 2017-09-09 12:49:17 -04:00
killer653
c5f4074ce4 Merge remote-tracking branch 'refs/remotes/VOREStation/master' into SHARP_MELEE_FIX 2017-09-09 12:39:59 -04:00
killer653
d435213617 Fixes sharp melee 2017-09-09 12:34:28 -04:00
Spades
cd57e49350 Merge pull request #2123 from Cameron653/MP5A5_FLUFF 
Updates SilencedMP5A5's fluff gun.
 2017-09-09 12:29:18 -04:00
Spades
1f3a61f38f Merge pull request #2116 from Verkister/tough_fluff 
Tough boy fluff stuff (Opie goggles + 2 special offer general loadout items)
 2017-09-09 12:27:38 -04:00
Spades
6eb472f31d Revert "Adds a new event - Solargrubs!" 2017-09-09 12:24:37 -04:00
Spades
6038c0a81f Merge pull request #2108 from Ketrai/master 
Adds a new event - Solargrubs!
 2017-09-09 12:24:26 -04:00
Spades
0e772d3b73 Merge pull request #2112 from VOREStation/GRAB_MICROS 
Makes pickup descriptions a bit more detailed, decreases pickup % diff
 2017-09-09 12:22:32 -04:00
Spades
dd53e67a92 Merge pull request #2126 from Cameron653/PAI_ENTER 
Allows ghosts to become a pAI
 2017-09-09 12:21:59 -04:00
Spades
d17c851ea0 Merge pull request #2114 from Funce/Borg-ooc-fix-take2 
Silicon OOC prefs fix TAKE 2
 2017-09-09 12:21:23 -04:00
Cameron653
efcd5e0795 Update death.dm 2017-09-08 23:21:25 -04:00
killer653
d644581ae9 Fixes gun mag preload 2017-09-08 07:04:46 -04:00
killer653
03d845d98f whitespace begone 2017-09-08 07:03:32 -04:00
killer653
0b95ed02e7 Updates serdy's gun 2017-09-08 07:02:10 -04:00
Funce
34266c2911 Adds OOC prefs to AI holograms 2017-09-07 15:43:22 +12:00
Funce
25ce01bebd Quick check added to prevent possible runtimes 2017-09-07 14:10:54 +12:00
Cameron653
6612fbb4d0 coils ->confines 2017-09-06 17:29:25 -04:00
Verkister
3bd672954d Tough boy fluff stuff (Opie goggles + 2 special offer general loadout items) 
-Adds the approved fluff goggles https://forum.vore-station.net/viewtopic.php?f=26&t=1073
-Also adds general use metal necklace thingy and a colorable headband for loadout selection.
 2017-09-06 15:55:16 +03:00
Ketrai
0ae8e9521a Fixing outdated file 
grubs grubs grubs, we all live for the grubs
 2017-09-06 12:04:29 +02:00
Funce
df33837b54 pAI's (When in chassis form) now also get OOC prefs 2017-09-06 16:05:00 +12:00
Funce
9629b4ba0c You can now see Borg OOC prefs when you aren't the borg now 2017-09-06 16:04:27 +12:00
Cameron653
06863de856 Fixes every problem in SS13 - Or maybe not. 2017-09-05 20:02:55 -04:00
Cameron653
82ee6e172a Makes pickup descriptions a bit more detailed, decreases pickup % diff 2017-09-05 19:51:28 -04:00
Ketrai
19f05fc628 fixed a tiny indent error 
wtf random tab
 2017-09-05 16:19:56 +02:00
Ketrai
592575cdca adds and enables grubevent 
shockin
 2017-09-05 16:12:50 +02:00
Ketrai
2d897fae13 adds grubmeat 
MEAT
 2017-09-05 16:11:41 +02:00
Ketrai
948f7b4724 Adds the grub event 
Randomly spawns about 8 grubs around station.
 2017-09-05 16:08:52 +02:00
Ketrai
674b310973 Adds new mob solargrub 
New mob
 2017-09-05 16:04:05 +02:00
Ketrai
08e98b9ba4 more grubtoxin stuff 
Adds vermicetol, secret chem to treat burns really effectively
 2017-09-05 16:01:36 +02:00
Ketrai
fb30c6f96b more grubtoxin stuff 
burn baby burn
 2017-09-05 16:00:11 +02:00
Ketrai
8673d5381a adds a chem for grubs 
they use it to burn people
 2017-09-05 15:58:27 +02:00
Ketrai
6dfbb1cda3 adds a chem for grubs 
grubs use this chem to burn people
 2017-09-05 15:57:11 +02:00
Kameren Arch
fde4f1fb5d adds 4 more monkeys to tf into 
sparra, wolpin, sobaka, and saru
 2017-09-04 13:32:26 -04:00
Spades
2dd7519e1b Loadouts 2017-09-03 14:33:13 -04:00
Spades
3e2bd9b6cf Merge pull request #2092 from VOREStation/space-roman-elves 
Attack of the Space Elves
 2017-09-02 22:09:30 -04:00
Spades
68ac3454be Merge pull request #2034 from kcin2001/master 
Adds xeno heads to be used with xeno hybrids and xenolike races
 2017-09-02 22:04:42 -04:00
Spades
627410ca44 Merge remote-tracking branch 'refs/remotes/origin/master' into space-roman-elves 2017-09-02 04:08:47 -04:00
Spades
e2941dfb5a Fixes some badly done vorestation edits in gasmasks 
also adds my new gas masks
 2017-09-02 04:07:51 -04:00
Spades
a55d4c5e4c Imperial Military Update 
Adds Imperial stuff for our space elf romans.
 2017-09-02 04:07:25 -04:00
Spades
c8f716bd2d Lore tweaks 2017-09-01 23:41:08 -04:00
Spades
c89512940f Merge pull request #2089 from Verkister/ghostboop 
Adds a ghost verb to alert blank pAI cards.
 2017-09-01 18:11:20 -04:00
Spades
c1645841df Merge pull request #2087 from Yoshax/cya 
Removes whitelist requirements from Daemon and Enochian
 2017-09-01 07:09:02 -04:00
Spades
b8cfee22a9 Merge pull request #2085 from Verkister/synthpaintjurbs 
Enables markings system on synth body parts.
 2017-09-01 07:08:51 -04:00
Spades
689db71720 Merge pull request #2084 from Funce/log-spam-fix 
Reduces log spam from simple_animals
 2017-09-01 07:08:34 -04:00
Spades
327a9c7f76 Update custom_permits_vr.dm 2017-09-01 06:50:03 -04:00
Verkister
f47db4995b Adds a ghost verb to alert blank pAI cards. 
-The verb causes available empty pAI devices to briefly flash an alert on their screens.
-Didn't add the sound part due to spam protections failing for the sake of annoyance prevention. Just gotta hope someone walks right past when ya do it.
-You can now indicate the things might actually be of use for once without having to resort to metabegging.
 2017-09-01 12:52:52 +03:00