cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-03 22:13:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
61,343 Commits 7 Branches 0 Tags
eff36c6eb1737bc41576d407e3a50c4f1635eec5
Commit Graph

28377 Commits

Author SHA1 Message Date
Razgriz
0e0accc447 Merge pull request #1112 from CHOMPStationBot/upstream-merge-9191 
[MIRROR] Vore transform overhaul
 2021-01-20 04:12:05 -07:00
Razgriz
8fd143039b Update bellymodes_datum_vr.dm 2021-01-20 01:00:01 -05:00
Chompstation Bot
d1f2ad4a18 Vore transform overhaul 2021-01-20 01:00:01 -05:00
Razgriz
a5b86d38e9 Merge pull request #1143 from CHOMPStation2/Razgriz1032-patch-7 
Change jellybrig escape chance
 2021-01-19 22:19:01 -07:00
Razgriz
19c887aca1 Merge pull request #1142 from cadyn/ballistics-v3.2 
Ballistics v3.2
 2021-01-19 20:28:31 -07:00
Razgriz
05fd8ae647 Change jellybrig escape chance 
From 10% to 2%. Good news it is 50% more likely to escape than to start digesting you.
 2021-01-19 20:17:04 -07:00
Cadyn
5364a0b965 Final touches 2021-01-19 18:56:14 -08:00
Cadyn
35543399cd Ballistics v3.2 2021-01-19 17:31:36 -08:00
Razgriz
dafe452b67 Merge pull request #1130 from CHOMPStationBot/upstream-merge-9580 
[MIRROR] Allows every species to select any biological sex.
 2021-01-19 15:35:23 -07:00
Razgriz
3434d0117f Update station_vr.dm 2021-01-19 15:25:47 -07:00
Razgriz
84856eccbb Merge pull request #1139 from LunarFleet/plant 
Make it so Alraune can properly choose what they grow
 2021-01-19 15:07:04 -07:00
Razgriz
296cb6e3dc Update station_vr.dm 2021-01-19 15:01:44 -07:00
Razgriz
898b91054b Merge pull request #1124 from BlackMajor/patch-6 
Tiny vorespawn fix
 2021-01-19 14:42:12 -07:00
BlackMajor
50baa06fea fuck you travis CI 2021-01-19 21:06:28 +13:00
LunarFleet
51bbf52c40 The holy one line edit 2021-01-18 19:22:40 -05:00
Nadyr
b95c39e483 Merge pull request #1129 from CHOMPStationBot/upstream-merge-9581 
[MIRROR] Makes me's in oldchat not be italicized
 2021-01-16 20:09:03 -05:00
Razgriz
72af6e6f23 Merge pull request #1117 from CHOMPStationBot/upstream-merge-9564 
[MIRROR] [MIRROR] Blob Genesis
 2021-01-16 18:05:40 -07:00
Razgriz
e705b08453 Merge pull request #1102 from CHOMPStationBot/upstream-merge-9559 
[MIRROR] Adds tertiary color glow/accents for the synth taurs
 2021-01-16 18:04:29 -07:00
Nadyr
d4454a93be Merge pull request #1128 from CHOMPStationBot/upstream-merge-9579 
[MIRROR] Allows Custom Species to select any of 5 physical genders.
 2021-01-16 20:04:06 -05:00
Nadyr
e0a2524187 Merge pull request #1127 from CHOMPStationBot/upstream-merge-9578 
[MIRROR] Some minor shadekin adjustments
 2021-01-16 20:02:52 -05:00
Nadyr
0909de94f4 Merge pull request #1126 from CHOMPStationBot/upstream-merge-9576 
[MIRROR] Fixes custom borg sprites.
 2021-01-16 20:01:44 -05:00
Chompstation Bot
b24c617b89 Allows every species to select any biological sex. 2021-01-17 00:00:40 +00:00
Novacat
ae3ece269d Merge pull request #9581 from Heroman3003/STOP-THE-ITALICS 
Makes me's in oldchat not be italicized
 2021-01-16 23:48:15 +00:00
Novacat
3a2e98e470 Merge pull request #9579 from Heroman3003/custom-genderization 
Allows Custom Species to select any of 5 physical genders.
 2021-01-16 23:47:05 +00:00
Novacat
9e27153990 Merge pull request #9578 from Heroman3003/shadekin-minor-stuff 
Some minor shadekin adjustments
 2021-01-16 23:45:55 +00:00
Novacat
4e489576c1 Merge pull request #9576 from VOREStation/Verkister-patch-8 
Fixes custom borg sprites.
 2021-01-16 17:53:12 +00:00
Novacat
2ae8d86416 Merge pull request #9575 from Verkister/chonkies 
More chubby oties
 2021-01-15 17:14:37 +00:00
Razgriz
51a0ab1d76 Merge pull request #1097 from Sharkmare/patch-1 
Fixing Red comfy Chairs. Closes #1014
 2021-01-13 22:26:37 -07:00
Razgriz
7def8d336e Merge pull request #1111 from CHOMPStationBot/upstream-merge-9565 
[MIRROR] [MIRROR] Corpse Landmarks Update pt1
 2021-01-13 22:16:02 -07:00
Razgriz
0303df5b07 Merge pull request #1110 from BlackMajor/gut 
Belly Filler 2: Electric Boogaloo, the Turniping
 2021-01-13 22:14:27 -07:00
BlackMajor
8673bcad39 Adjustments following feedback 2021-01-14 03:36:05 +13:00
Chompstation Bot
6ddd2efb7b [MIRROR] Blob Genesis 2021-01-13 00:22:31 +00:00
Shadow-Quill
f46a23f982 Update emote.dm 2021-01-12 17:25:10 -05:00
Shadow-Quill
e2c6046ce4 Update emote.dm 2021-01-12 17:03:26 -05:00
Shadow-Quill
936c7acfa8 Update emote.dm 2021-01-12 16:40:17 -05:00
Razgriz
c861148393 Fix X01 stun projectil 
It starts out as a taser beam. When you cycle through the modes and come back to the stun setting, it starts shooting an electrode instead. This fixes that and sets it back to the taser beam.
 2021-01-12 00:59:19 -07:00
BlackMajor
3f86a2e857 Dragon horn sprite I guess 2021-01-12 18:59:57 +13:00
Novacat
6be0583994 Merge pull request #9565 from VOREStation/upstream-merge-7801 
[MIRROR] Corpse Landmarks Update pt1
 2021-01-12 03:53:39 +00:00
BlackMajor
82f5c6019a this took way too long 2021-01-12 02:19:43 +13:00
Razgriz
6412b44357 Remove phase in/out messages 2021-01-10 21:25:42 -07:00
Razgriz
98561d8388 Update CH icon pointer 2021-01-10 17:19:52 -07:00
Razgriz
213b7ae3d4 Remove duplicate and Booze YW code, change CH pointer 2021-01-10 17:18:44 -07:00
Razgriz
4ca77dec5a Remove else statement forcing widerobot_vr.dmi 2021-01-10 17:17:27 -07:00
Razgriz
bd927d3976 Remove YW boozeborg code 
Now found in /code/modules/mob/living/silicon/robot/subtypes/boozeborg_ch.dm
 2021-01-10 15:50:04 -07:00
Razgriz
7017b9edf0 Comment out YW boozeborg code 
Now found in /code/modules/mob/living/silicon/robot/subtypes/boozeborg_ch.dm
 2021-01-10 15:49:19 -07:00
Razgriz
2cf4ba2c4f Merge pull request #1104 from CHOMPStationBot/upstream-merge-9561 
[MIRROR] [MIRROR] Makes vending virus spelling consistent.
 2021-01-10 01:21:01 -07:00
Razgriz
b56aaa5b1c Merge pull request #1103 from Ketrai/furs 
Adds a bunch of wearable animal furs to the loadout
 2021-01-10 01:20:41 -07:00
Razgriz
82c293f8b2 Merge pull request #1096 from MisterGrimm/ScreamForMe 
Add unathi scream
 2021-01-10 01:19:01 -07:00
Novacat
861e850f0b Merge pull request #9561 from VOREStation/upstream-merge-7814 
[MIRROR] Makes vending virus spelling consistent.
 2021-01-10 05:59:06 +00:00
Ketrai
12ce67b2fa Adds a bunch of animal furs 
Whooeee
 2021-01-09 22:04:09 +01:00