cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 19:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
61,210 Commits 9 Branches 0 Tags
ddbc8874c28f7cc4b53db404e91a57e50329af2a
Commit Graph

28321 Commits

Author SHA1 Message Date
Novacat
ddbc8874c2 Merge pull request #9557 from Novacat/nova-basicfixes 
Some fixes
 2021-01-09 05:53:13 +00:00
Razgriz
ea80be587b Merge pull request #750 from MisterGrimm/GoodbyeMicromechs 
Commenting out micro mech stuff
 2021-01-08 15:20:57 -07:00
Nadyr
4182adfb19 Update station_vr.dm 2021-01-07 22:26:38 -05:00
Chompstation Bot
601c842d13 Added Drakeborgs for sillicons along with plushies 2021-01-06 19:52:47 +00:00
Razgriz
8dea41e95b Could have sworn I disabled the moderate carp event... 2021-01-05 19:55:51 -07:00
Razgriz
7d9c02a14a Merge pull request #1079 from Sharkmare/patch-1 
Changing shadekin to RESTRICTED from WHITELISTED
 2021-01-05 00:14:31 -07:00
Sharkmare
adbfa82993 Typo fix 
Typo fix
 2021-01-05 08:01:17 +01:00
Sharkmare
c671f2e3e6 Giving Xenoarch 18 Unique Eguns 
Gives Xenoarch the 12 Original egun variants and on top of that adds the 6 ones added by Vore Station. Also Moves xenoarch eguns into their own dmi file found at 'icons/obj/xenoegun/xeno-guns_ch.dmi'
 2021-01-05 07:39:25 +01:00
The-Cicada
0b43f2f06c Giving Xeno archeology 18 unque eguns 
Giving Xeno archeology 18 unque eguns
 2021-01-05 07:25:36 +01:00
Razgriz
e7726e9d4f Remove micro recoil for OG Phaser 2021-01-04 17:54:31 -07:00
Razgriz
26e70c41fd Remove micro recoil for particle guns 2021-01-04 17:53:46 -07:00
Razgriz
279d93de3d Remove micro recoil from phasers 2021-01-04 17:52:56 -07:00
Razgriz
0fe5447fe5 Update types_ch.dm 2021-01-03 20:11:44 -07:00
Nadyr
e6302abf67 Merge pull request #1078 from CHOMPStationBot/upstream-merge-9525 
[MIRROR] Makes pixel shifting work while resting
 2021-01-03 22:09:10 -05:00
Nadyr
ce205bbbce Merge pull request #1064 from CHOMPStationBot/upstream-merge-9523 
[MIRROR] Updates Ketrai's fluff item sprite
 2021-01-03 22:02:01 -05:00
Nadyr
3a7132cc05 Merge pull request #1060 from CHOMPStationBot/upstream-merge-9519 
[MIRROR] Fixes belly nutrition percent setting not affecting borgs
 2021-01-03 21:56:38 -05:00
Nadyr
a9ca3defa5 Merge pull request #1068 from CHOMPStationBot/upstream-merge-9528 
[MIRROR] Adds fluff skirt outfits to loadout blacklist
 2021-01-03 21:47:28 -05:00
Nadyr
424af5a5cf Merge pull request #1067 from CHOMPStationBot/upstream-merge-9527 
[MIRROR] [MIRROR] Adds a Whip.
 2021-01-03 21:41:43 -05:00
Nadyr
4b21704167 Update bellymodes_datum_vr.dm 2021-01-03 21:32:53 -05:00
Nadyr
fb3dbd20dd Update bellymodes_vr.dm 2021-01-03 21:28:07 -05:00
Sharkmare
21463cd69b Changing shadekin to RESTRICTED from WHITELISTED 
This makes it so shadekin is never a selectable language but rather has to be assigned by the game automatically, similar to how root talk on diona behaves. 

This may break carbon shadekin from selecting this language if they dont assign it the same way diona do.
Howevcer we don't plan to use Shadekin carbons soooooo, yeah.
 2021-01-03 22:23:52 +01:00
Verkister
1df71bdd8a Merge pull request #9525 from VOREStation/Verkister-patch-6 
Makes pixel shifting work while resting
 2021-01-03 10:10:25 +00:00
Razgriz
834294ac49 Merge pull request #1046 from CHOMPStationBot/upstream-merge-9493 
[MIRROR] More mob tweaks
 2021-01-03 00:07:39 -07:00
Razgriz
6472a24e21 Update metroid event weights 
Changed weights for security, HOS, warden, and scientist.
 2020-12-31 21:27:21 -07:00
Novacat
fb2db44754 Merge pull request #9528 from Tenryumi/fluff-skirt-outfit-blacklisting 
Adds fluff skirt outfits to loadout blacklist
 2020-12-28 18:24:26 +00:00
Novacat
7e16cd134a Merge pull request #9527 from VOREStation/upstream-merge-7780 
[MIRROR] Adds a Whip.
 2020-12-28 17:12:39 +00:00
Novacat
e8bebaf761 Merge pull request #9524 from Heroman3003/shadehud2 
Consolidates and updates shadekin energy/darkness HUD
 2020-12-27 07:34:07 +00:00
Novacat
f662c3bcb4 Merge pull request #9523 from Ketrai/peltupdate 
Updates Ketrai's fluff item sprite
 2020-12-27 07:34:00 +00:00
Chompstation Bot
57d61e2ffb Fixes belly nutrition percent setting not affecting borgs 2020-12-25 20:37:01 +00:00
Razgriz
fc8900f191 Merge pull request #1050 from CHOMPStationBot/upstream-merge-9498 
[MIRROR] [MIRROR] Powered Exosuit Running Board (from /vg/station)
 2020-12-23 13:21:18 -07:00
Novacat
cabb515fae Merge pull request #9498 from VOREStation/upstream-merge-7787 
[MIRROR] Powered Exosuit Running Board (from /vg/station)
 2020-12-23 14:16:45 +00:00
Razgriz
83dc173f9c Update simple_mob_vr.dm 2020-12-23 03:41:01 -07:00
Chompstation Bot
3d2f5f8251 More mob tweaks 2020-12-22 19:57:09 +00:00
Chompstation Bot
c8e698aac2 Wreck & Debris Field Updates 2020-12-22 15:32:40 +00:00
Nadyr
eff2d50cde Merge pull request #1036 from CHOMPStationBot/upstream-merge-9468 
[MIRROR] Allow remote control of disposal bins for silicons
 2020-12-19 18:51:42 -05:00
Nadyr
9144bd0391 Merge pull request #1035 from CHOMPStationBot/upstream-merge-9474 
[MIRROR] Adds in Measuring cups, and nickname's to the character load selection.
 2020-12-19 18:50:42 -05:00
Nadyr
998c177250 Merge pull request #1034 from CHOMPStationBot/upstream-merge-9475 
[MIRROR] borgs using IC printer fix - NOT WEBEDIT HELL EDITION
 2020-12-19 18:49:58 -05:00
Nadyr
a8d26f4135 Merge pull request #1027 from CHOMPStationBot/upstream-merge-9470 
[MIRROR] Adds bluespace badge
 2020-12-19 18:29:34 -05:00
Nadyr
750c1f140c Merge pull request #1010 from CHOMPStationBot/upstream-merge-9455 
[MIRROR] [MIRROR] RPED QoL Tweak(s)/Unimplemented RPED Variant
 2020-12-19 18:29:07 -05:00
Kassc
dcb8a1d07c Merge pull request #1025 from Darlantanis/Leopardmander 
Leopardmander vore mob
 2020-12-19 16:31:45 -05:00
Novacat
edf3e86cfc Merge pull request #9468 from tigercat2000/patch-1 
Allow remote control of disposal bins for silicons
 2020-12-18 19:38:29 +00:00
Novacat
e481ed54e5 Merge pull request #9474 from lukevale/master 
Adds in Measuring cups, and nickname's to the character load selection.
 2020-12-18 19:32:12 +00:00
Novacat
ae4a25ade9 Merge pull request #9475 from Hatterhat/patch-1 
borgs using IC printer fix - NOT WEBEDIT HELL EDITION
 2020-12-18 19:31:03 +00:00
Shadowfire
d15968eff6 Last Christmas! 
Final adjustments to the presents!
New fat taur sprite with three colors and a vulp skullmask that totally doesnt look like Churo from Different (TM)! Sprites made by our good friend Blitzkrieg
Merry Christmas all!
 2020-12-18 17:38:55 +01:00
Shadowfire
7efe6f2cad Auto stash before rebase of "CHOMPStation2/master" 2020-12-18 17:02:15 +01:00
Kassc
f95e26eadc Merge pull request #1030 from Kazzc/CasinoXmas2.0 
Casino xmas2.0
 2020-12-17 19:12:30 -05:00
Kassc
9fb6636f71 Merge pull request #1029 from Shadowfire117/ExtraMas 
Christmas time is once a year..
 2020-12-17 19:04:30 -05:00
Kassc Zeravla
4fbd6ee7cf Casino Xmas 2.0 
-Mayor map tweaking to increase performance of the server.
-Modified Virgo's tables so one can climb and walk on them like a surface.
-Various tweaking on decals and turfs and areas to make it more pretty.
 2020-12-17 18:19:14 -05:00
Shadowfire
6b70b133ba Christmas time is once a year.. 
Made changes to allow casino manual to fit into the casino wallet for easy reading.
Made Santa's sack! Only he can take presents from it!
Made the new presents have a nice wide selection of gifts, but chaos presents are disabled so far!
Fixed 'the cake' somewhat and made a grenade to spawn its components.
made Santa's coat.
made an overdrive version of the confetti gun.
 2020-12-17 17:20:24 +01:00
Kassc
2718d0bbbe Merge pull request #1016 from Shadowfire117/ChristmasCasino 
So this is Christmas...
 2020-12-17 04:17:30 -05:00