cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-06-06 14:53:19 +01:00
Code Issues Packages Projects Releases Wiki Activity
61,401 Commits 6 Branches 0 Tags
5bbdccefa507cb5f4cbcf8a9064cb14259ddfc61
Commit Graph

28410 Commits

Author SHA1 Message Date
cadyn 5bbdccefa5 Revert "[MIRROR] Fixes defib timers being 10 times as long compared to intended." 2021-01-24 18:53:16 -08:00
cadyn c059ff700e Merge pull request #1174 from Sharkmare/drone-unify 
Law and subtype preparation for new drones
 2021-01-24 08:47:16 -08:00
cadyn 3c541d7ecb Merge pull request #1176 from Darlantanis/VoreSlug 
Vore slug and forest turf fix
 2021-01-24 08:46:49 -08:00
Darlantan 6b53683dcd Vore slug 
Mob, mob icons, random spawn for mob
 2021-01-24 11:03:35 -05:00
Darlantan eb287bb414 Small oversights in leopardmander and pitcher 2021-01-24 11:01:46 -05:00
Sharkmare 15387c5a80 fixing typo in filename 2021-01-24 16:18:12 +01:00
cadyn c5ae5ec866 Merge pull request #1134 from CHOMPStation2/cadyn-patch-5 
Delete defib timer
 2021-01-24 06:52:37 -08:00
cadyn 4f9ed16579 Merge pull request #1165 from CHOMPStationBot/upstream-merge-9598 
[MIRROR] Fixes defib timers being 10 times as long compared to intended.
 2021-01-24 06:52:18 -08:00
cadyn 199c0602ea Merge pull request #1166 from CHOMPStationBot/upstream-merge-9597 
[MIRROR] Removes Herm option for biological gender
 2021-01-24 06:50:51 -08:00
cadyn 7743c47718 Merge pull request #1170 from CHOMPStationBot/upstream-merge-9544 
[MIRROR] [MIRROR] Fixes dark click catcher
 2021-01-24 06:49:14 -08:00
cadyn a9e6836bf3 Merge pull request #1169 from CHOMPStationBot/upstream-merge-9573 
[MIRROR] [MIRROR] Gadgets & Gizmos
 2021-01-24 06:48:03 -08:00
Sharkmare 4ed83ee71d Law and subtype preparation for drones 
Defines law subsets and typings for drones, this is step 1 of two, second step will be adding back the tool sets for the unique drones
 2021-01-24 15:22:29 +01:00
Razgriz beaf119524 Update station_vr.dm 2021-01-24 01:21:42 -07:00
Novacat d9c7aba53d Merge pull request #9544 from VOREStation/upstream-merge-7803 
[MIRROR] Fixes dark click catcher
 2021-01-24 06:57:14 +00:00
Novacat 5211edc9c0 Merge pull request #9573 from VOREStation/upstream-merge-7786 
[MIRROR] Gadgets & Gizmos
 2021-01-24 06:55:05 +00:00
Novacat ee29b120ad Merge pull request #9511 from VOREStation/upstream-merge-7800 
[MIRROR] Fixes discarding cards onto walls
 2021-01-24 06:46:48 +00:00
Chompstation Bot 5d4fd0ee29 Removes Herm option for biological gender 2021-01-24 06:44:32 +00:00
Novacat 57e1be6caa Merge pull request #9598 from Heroman3003/defibfix 
Fixes defib timers being 10 times as long compared to intended.
 2021-01-24 06:34:15 +00:00
Razgriz e1a8116a83 Merge pull request #1160 from CHOMPStationBot/upstream-merge-9593 
[MIRROR] Pre-emptive Pre port of CHicken noodle soup item from Polaris
 2021-01-23 18:13:23 -07:00
Novacat 225e22cf87 Merge pull request #9593 from H0lySquirr3l/master 
Pre-emptive Pre port of CHicken noodle soup item from Polaris
 2021-01-23 17:20:25 +00:00
Erik 0b315e6284 Single proc arg patch size chem animation removal 
fumk
 2021-01-23 04:21:01 -08:00
cadyn 58e59eaa6b Merge pull request #1149 from Sharkmare/master 
Adds Sharkpile prototype + 939
 2021-01-22 11:11:38 -08:00
Razgriz c026b6075e Update hivebot.dm 2021-01-21 19:45:32 -07:00
Razgriz 6347a0a6b5 Hivebot uses 22lr bullet now 
Hivebot uses 22lr bullet now
 2021-01-21 19:44:42 -07:00
Razgriz 0f781684d9 Update bullets_ch.dm 
Add comments describing the new variables
 2021-01-21 19:30:17 -07:00
Razgriz 1889d68b2b Update bullets_ch.dm 2021-01-21 18:41:23 -07:00
Razgriz 768c79d42d Update bullets_ch.dm 2021-01-21 18:33:44 -07:00
Razgriz 48e93151e9 Add 22 long rifle bullet 
Nothing currently shoots this, but I will make it the bullet of choice for the hivebot.
 2021-01-21 18:23:27 -07:00
Sharkmare 092a500d3d Disabling poisonining on 939 
Almost forgot this
 2021-01-21 09:38:52 +01:00
Sharkmare 4d406f66cb Sprites finally added 939 
It took a while but now the bois have sprites
 2021-01-21 09:21:54 +01:00
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
cadyn fdbe1750cf Update organ.dm 2021-01-19 20:13:09 -08: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
cadyn 0837218461 another thingy 2021-01-16 23:08:11 -08:00
cadyn 76c3f49a0f Other thing that needed to be removed 2021-01-16 22:49:15 -08: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