cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-01 21:13:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
69,702 Commits 8 Branches 0 Tags
00fa8ea63eafec415bc5d16a606eee8a97258a13
Commit Graph

13552 Commits

Author SHA1 Message Date
Nadyr
1d004e4bb8 Merge branch 'master' into upstream-merge-13038 2022-06-04 20:23:28 -04:00
Nadyr
ddc0c05b1f Merge pull request #4318 from CHOMPStation2/upstream-merge-13031 
[MIRROR] pAI and emote tweaks and upgrades
 2022-06-04 20:20:56 -04:00
Nadyr
4ee2427aaf powder that makes you say yes 2022-06-04 19:54:56 -04:00
Casey
3d5d4f1be8 Makes new pAI obtainable 2022-06-04 20:03:22 +00:00
Casey
45b9b743ef Merge pull request #13030 from ItsSelis/selis-byond-ui 
Adds Input (Hotkeys) Preference
 2022-06-04 16:30:29 +00:00
Casey
d3e0d8524c pAI and emote tweaks and upgrades 2022-06-04 10:00:21 +00:00
Cyrelius
dad3d95ff0 Merge branch 'master' of https://github.com/Cyrelius/CHOMPStation2 2022-05-29 13:45:23 -07:00
Cyrelius
5d9eb25fbc Update prommie_blob.dm 
Adds more of the protean's functionality regarding damage, and seeing in the darkness, as we don't want you to suddenly be blind if you swap into blobform in the dark.
 2022-05-29 13:44:28 -07:00
Cyrelius
403b3c35f0 Merge branch 'CHOMPStation2:master' into master 2022-05-29 11:24:40 -07:00
Cyrelius
d3557678b4 Un-nerf Promethean blobs. 
Gives them the same capabilities as Protean blobs regarding speed and hands.  Also removes the weakened state, and gives them the radio/ID of their previous form.
 2022-05-29 11:23:56 -07:00
Cyrelius
11458d109f Update prommie_blob.dm 
Makes Prommie blobs as fast as Protean blobs.
 2022-05-28 17:39:06 -07:00
Cyrelius
cef5855bbb Update prommie_blob.dm 
Removes the part where prommie blobs have to drop everything, because that's stupid.
 2022-05-28 17:15:19 -07:00
Nadyr
da96f8eb8e Merge pull request #4293 from Cyrelius/master 
Restores a change to Extracts and adds Sana as a spawnable mob.
 2022-05-27 16:20:24 -04:00
Nadyr
64b0842429 Merge pull request #4292 from CHOMPStation2/upstream-merge-13009 
[MIRROR] Fixes "Lick Wounds" Verb Range
 2022-05-27 16:19:07 -04:00
Cyrelius
2e7c8520bf Remove uneeded comments 
Copied comments from Kendrick weren't necessary in Sana.
 2022-05-24 11:33:04 -07:00
Cyrelius
13041f06b9 Xenobio maintenance and addition of Sana as a static mob. 
As summary.  Adds Sana, and changes the number of monkey cubes back up to 5, as Virgo overrode the original file.
 2022-05-24 11:30:29 -07:00
Cyrelius
8237963ae8 Merge branch 'CHOMPStation2:master' into master 2022-05-24 11:10:19 -07:00
Novacat
36fa4e46dc Merge pull request #13009 from ItsSelis/patch-2 
Fixes "Lick Wounds" Verb Range
 2022-05-24 14:27:42 +00:00
Casey
19705c8391 Merge pull request #13003 from Runa-Dacino/numbing_belly_fix 
Fixes numbing_belly/painkillers NOT blocking shock messages
 2022-05-22 18:31:14 +00:00
Novacat
3109c7a689 Merge pull request #13001 from SpringSkipper/spring-cold-breathing 
Fix Cold Air Breathing Damage
 2022-05-21 23:17:06 +00:00
Razgriz
b2c213420d Merge pull request #4263 from VictorZisthus/gripperfix 
Gripper buff
 2022-05-18 13:29:38 -07:00
Victor Zisthus
24e4ab6b51 Fix 2022-05-15 21:07:06 -04:00
Victor Zisthus
705ff26285 Gripper buff 
Bottom text.

Allows borgs with said gripper to actually be able to help build Telesci equipment.
 2022-05-15 20:52:48 -04:00
Casey
caa90d5eee Merge pull request #12951 from TankTheBirb/master 
Silicons now have omnihud and EMT borgs have inflatables
 2022-05-15 20:10:10 +00:00
Razgriz
5043c8fd9d Merge pull request #4250 from CHOMPStation2/upstream-merge-12962 
[MIRROR] Xenobio fixes
 2022-05-14 14:43:55 -07:00
Novacat
31b50e8e6e Merge pull request #12962 from Heroman3003/xenobio-fix 
Xenobio fixes
 2022-05-13 23:50:33 +00:00
Victor Zisthus
1cc3d1937a Chapel POI edit + Gravekeeper Drone Bugfix 
Added some goodies to the chapel to make it a rest stop for explorers, and a viable base of operations for the gravekeeper drone. Increased it's generator recharge rates and gave it a SMES. If you manage to blow through all that power now...

Fixed the gravekeeper drone's emag item. Apparently, they only get one. Oops. Also gave it the ability to actually clean messes.
 2022-05-12 20:34:57 -04:00
Nadyr
7b6fff129f Merge pull request #4246 from CHOMPStation2/upstream-merge-12945 
[MIRROR] Sapient Bot Patches
 2022-05-12 19:38:26 -04:00
Casey
c4d92d6238 Merge pull request #12945 from FartMaster69420/bot-patch 
Sapient Bot Patches
 2022-05-12 19:29:20 +00:00
Casey
9f6a9a4e6a Merge pull request #12897 from FartMaster69420/cocoon 
Cocoon Metamorphosis
 2022-05-12 19:21:53 +00:00
Razgriz
70d0e4cf4b Merge pull request #4229 from Raeschen/benos 
Creates a "better" xenomorph simple_mob type + other tweaks
 2022-05-11 10:04:57 -07:00
Razgriz
c3fdc6d677 Merge pull request #4227 from CHOMPStation2/upstream-merge-12934 
[MIRROR] Chest -> Torso Targeting Fixes
 2022-05-11 10:04:45 -07:00
Razgriz
cad28c1e69 Merge pull request #4235 from CHOMPStation2/upstream-merge-12937 
[MIRROR] Adds flat aeromorph wings
 2022-05-10 22:08:11 -07:00
Razgriz
2e5d144afa Merge branch 'master' into benos 2022-05-10 22:05:55 -07:00
Razgriz
c7d8f6dcc5 powder that makes you say yes 2022-05-10 22:03:23 -07:00
Razgriz
822acd97e5 Merge pull request #4203 from VictorZisthus/general-fixes 
Making Gravekeeper Drone Viable
 2022-05-10 22:01:11 -07:00
Novacat
73fc46d127 Merge pull request #12937 from Heroman3003/aeromorph-wings-flat 
Adds flat aeromorph wings
 2022-05-10 14:58:27 +00:00
Raeschen
bab9bcf1f8 Merge branch 'CHOMPStation2:master' into benos 2022-05-09 15:19:03 +02:00
Rae
3a61e8fac6 initial commit 2022-05-09 14:58:55 +02:00
Novacat
24aa127d67 Chest -> Torso Targeting Fixes 2022-05-09 01:08:04 +00:00
Nadyr
d86d2ccdf1 Merge pull request #4217 from CHOMPStation2/upstream-merge-12912 
[MIRROR] Adds Vertical Nom trait
 2022-05-08 11:15:43 -04:00
Nadyr
bc74b92698 Merge pull request #4216 from CHOMPStation2/upstream-merge-12902 
[MIRROR] Adds Echo Song language
 2022-05-08 11:14:49 -04:00
Nadyr
23ffa518e7 Merge pull request #4215 from CHOMPStation2/upstream-merge-12905 
[MIRROR] Alt. Naga Style Port
 2022-05-08 11:13:01 -04:00
Nadyr
6c87352aa5 Merge pull request #4211 from CHOMPStation2/upstream-merge-12888 
[MIRROR] The pAI, Bot, and Microwave Tweaks
 2022-05-08 11:10:07 -04:00
Nadyr
f0584a5ae2 Merge pull request #4207 from CHOMPStation2/upstream-merge-12877 
[MIRROR] Makes "Succumb" an IC verb, adds warnings
 2022-05-08 11:06:55 -04:00
Casey
20f95cb706 Merge pull request #12912 from Heroman3003/vertical-nom 
Adds Vertical Nom trait
 2022-05-08 09:54:44 +00:00
Casey
2cb5401848 Merge pull request #12902 from Heroman3003/echosong 
Adds Echo Song language
 2022-05-08 09:53:38 +00:00
Casey
98c566f570 Merge pull request #12905 from KillianKirilenko/kk-newnaga 
Alt. Naga Style Port
 2022-05-08 09:53:33 +00:00
Casey
fbd967128d Merge pull request #12888 from FartMaster69420/pai_and_bots 
The pAI, Bot, and Microwave Tweaks
 2022-05-08 09:46:55 +00:00
Casey
09a13bb614 Merge pull request #12877 from Runa-Dacino/succumb_make_public 
Makes "Succumb" an IC verb, adds warnings
 2022-05-08 09:41:18 +00:00