cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,198 Commits 5 Branches 0 Tags
f4f532693e5671e7c6db5480c89fedd4ff3d389b
Commit Graph

32721 Commits

Author SHA1 Message Date
Spades
f4f532693e Merge pull request #4100 from VOREStation/upstream-merge-5449 
[MIRROR] Speeds up alcohol ingested effects
 2018-09-01 17:31:35 -04:00
Spades
7b86d2ba4f Merge pull request #4099 from VOREStation/upstream-merge-5450 
[MIRROR] Fixed mining cloak not being in loadouts
 2018-09-01 17:31:06 -04:00
Spades
35f3e81ca3 Merge pull request #3940 from Verkister/buttmount 
Reworks taur riding system.
 2018-09-01 17:25:23 -04:00
Spades
64484a6591 Merge pull request #4095 from VOREStation/upstream-merge-5442 
[MIRROR] Admin Supermatter Setup now closes the monitoring room shutters
 2018-08-21 05:41:49 -04:00
Spades
1e38ff859b Merge pull request #4080 from Verkister/honkery 
Couple clown tweaks.
 2018-08-20 08:07:07 -04:00
Spades
a8f8631cfe Merge pull request #4108 from VOREStation/upstream-merge-5453 
[MIRROR] Replaces Skrell namegen
 2018-08-20 08:06:37 -04:00
Spades
1893340d6e Merge pull request #4180 from VOREStation/upstream-merge-5507 
[MIRROR] Fixes incorrect ETA in crew transfer announcement
 2018-08-20 08:06:02 -04:00
Spades
eee6cc7337 Merge pull request #4107 from Eearslya/patch-1 
Fix minor typo in vore attempt warning
 2018-08-20 08:01:09 -04:00
Anewbe
6ef5940260 Merge pull request #5507 from Verkister/patch-14 
Fixes incorrect ETA in crew transfer announcement
 2018-08-19 00:05:49 -04:00
Verkister
25487e6094 edit comments 2018-08-18 12:20:27 +03:00
Spades
16f5ea792b Merge pull request #4091 from VOREStation/upstream-merge-5444 
[MIRROR] Adds the Gigaphone, a suped-up Megaphone.
 2018-08-17 16:13:10 -04:00
Spades
1e27743718 Merge pull request #4087 from VOREStation/upstream-merge-5445 
[MIRROR] Constant Chip has a sprite
 2018-08-17 16:12:57 -04:00
Spades
c1c7af946b Merge pull request #4084 from VOREStation/upstream-merge-5441 
[MIRROR] Fixes the PDA Halogen Scanner's tendency to be number one.
 2018-08-17 16:12:24 -04:00
Spades
887899f50b Merge pull request #4082 from VOREStation/upstream-merge-5439 
[MIRROR] Fixes layering issues for a few things
 2018-08-17 16:12:12 -04:00
Spades
4ab6d7c983 Merge pull request #4081 from VOREStation/upstream-merge-5438 
[MIRROR] AOOC for team traitor
 2018-08-17 16:11:55 -04:00
Spades
e6f2a72d92 Merge pull request #4075 from VOREStation/upstream-merge-5433 
[MIRROR] Limits fire_stacks on mobs by temperature
 2018-08-17 16:11:40 -04:00
Spades
4c001b1e2a Merge pull request #4072 from VOREStation/upstream-merge-5431 
[MIRROR] Fixes RCD runtime
 2018-08-17 16:11:19 -04:00
Spades
69c0cd8b8c Merge pull request #3983 from Verkister/synthmarking 
Couple VS compatibility tweaks on the synthlimb markings option.
 2018-08-17 16:09:56 -04:00
Spades
7f9d5f0fb7 Merge pull request #4175 from VOREStation/upstream-merge-5503 
[MIRROR] (HOPEFULLY) fixes advanced who highlighting the fake ckeys of stealth admins
 2018-08-17 16:09:26 -04:00
Spades
f4a28a179c Merge pull request #4069 from VOREStation/upstream-merge-5430 
[MIRROR] Fixes a few on-mob gun sprites
 2018-08-17 16:07:50 -04:00
Spades
6f35a33e1c Merge pull request #4068 from VOREStation/upstream-merge-5429 
[MIRROR] Adds Marking Order Changing at Character Creation
 2018-08-17 16:07:33 -04:00
Spades
6a95420bf9 Merge pull request #4064 from VOREStation/upstream-merge-5426 
[MIRROR] Fixes a few bugs associated with the Dead Ringer
 2018-08-17 16:07:16 -04:00
Spades
bf98b4238d Merge pull request #4063 from VOREStation/upstream-merge-5425 
[MIRROR] Adds an indent formatting tag to paper
 2018-08-17 16:06:56 -04:00
Spades
ddba78b5a8 Merge pull request #4062 from VOREStation/upstream-merge-5428 
[MIRROR] Fixes anomaly suits being invisible. For real this time.
 2018-08-17 16:06:44 -04:00
Spades
7ace233760 Merge pull request #4105 from ArgobargSoup/master 
Cosmetic tweaks for catgirls.
 2018-08-17 16:06:22 -04:00
Spades
7bec3f26aa Merge pull request #4152 from VOREStation/upstream-merge-5487 
[MIRROR] PENGUINS ARE FROM EARTH
 2018-08-17 16:06:02 -04:00
Spades
967f42b682 Merge pull request #4056 from VOREStation/upstream-merge-5420 
[MIRROR] Fixes Indoor Weather
 2018-08-17 16:05:04 -04:00
Spades
5fd2285dfc Merge pull request #4147 from VOREStation/upstream-merge-5485 
[MIRROR] Fixes the Ultra AC2's burstfire bug.
 2018-08-17 16:04:47 -04:00
Anewbe
995754e1d5 Merge pull request #5503 from deathride58/snitchesgetstitches 
(HOPEFULLY) fixes advanced who highlighting the fake ckeys of stealth admins
 2018-08-17 13:47:06 -04:00
Spades
db804f02ee Merge pull request #4061 from VOREStation/upstream-merge-5423 
[MIRROR] Implements ways to make floors not get dirty
 2018-08-16 05:44:19 -04:00
Spades
6919cca96d Merge pull request #4070 from Knightfall5/master 
Ashley's fluff item
 2018-08-15 18:36:28 -04:00
Verkister
85a7c2d7d4 snip 2018-08-14 09:16:42 +03:00
Verkister
6cb51f741a Merge branch 'master' into synthmarking 2018-08-14 09:09:14 +03:00
Spades
84a3d824de Merge pull request #3885 from Cameron653/ALRAUNE_STUFF 
Alraune abilities and minor code changes
 2018-08-13 07:50:23 -04:00
Spades
ed06781743 Merge pull request #3759 from Verkister/belletweakins 
Dogborg equipment/belly tweaks and fixes. (Ready)
 2018-08-13 07:49:55 -04:00
Anewbe
1d44e34e85 Merge pull request #5487 from elgeonmb/patch-8 
PENGUINS ARE FROM EARTH
 2018-08-09 15:55:00 -04:00
Neerti
e7615d56f4 Merge pull request #5485 from Mechoid/Fix_Mechanized_Chainsaw 
Fixes the Ultra AC2's burstfire bug.
 2018-08-08 02:10:59 -04:00
Nadyr
28974eaf2d Fixed a grammatical error in shadekin hold flavor text. 2018-08-01 20:05:48 -05:00
Sharkmare
229887eb55 Proteans now able to use Teshari DSI prosthetics 2018-08-01 23:52:02 +02:00
Baguette
34f7d86791 Replaces Skrell namegen (#5453) 
Created a first name list for Skrell, to replace the syllable assembler.

Created a surname list for Skrell to replace the syllable assembler.

Replaced the Skrell namegen with pre-written namelists, instead of the old syllable assembler.
 2018-07-30 05:10:40 -04:00
Eearslya Sleiarion
572f7e1623 Fix minor typo in vore attempt warning 2018-07-30 00:30:33 -07:00
ArgobargSoup
403ee2eba5 Cosmetic tweaks for catgirls. 2018-07-29 14:08:11 -07:00
Atermonera
ff1c9dd020 Merge pull request #5449 from Anewbe/booze 
Speeds up alcohol ingested effects
 2018-07-29 02:55:16 -04:00
Atermonera
966261c6d9 Merge pull request #5450 from Heroman3003/mining-cloak-fix 
Fixed mining cloak not being in loadouts
 2018-07-29 02:55:02 -04:00
Anewbe
5c2d57e43b Admin Supermatter Setup now closes the monitoring room shutters (#5442) 
* Admin Supermatter Setup now closes the monitoring room shutters

* Fixes a copy-paste error
 2018-07-28 01:09:01 -04:00
Anewbe
6c6c5a2255 Merge pull request #5444 from Mechoid/Gigglephone 
Adds the Gigaphone, a suped-up Megaphone.
 2018-07-27 19:28:36 -04:00
Neerti
96d5f49091 Merge pull request #5445 from Anewbe/memory_circuit_sprite 
Constant Chip has a sprite
 2018-07-27 02:16:47 -04:00
Anewbe
975b5a7bf2 Merge pull request #5441 from Mechoid/Halogenscannerreeee 
Fixes the PDA Halogen Scanner's tendency to be number one.
 2018-07-26 15:14:18 -04:00
Anewbe
0abdfff854 Merge pull request #5439 from Neerti/layer_fixes 
Fixes layering issues for a few things
 2018-07-25 17:27:05 -04:00
Anewbe
41724cebea Merge pull request #5438 from PrismaticGynoid/infiltrator_aooc 
AOOC for team traitor
 2018-07-25 17:25:51 -04:00