cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 04:02:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
69,862 Commits 5 Branches 0 Tags
f20f331fd6fb2bc1c2d6540ec9804cfa00d7ca08
Commit Graph

32516 Commits

Author SHA1 Message Date
Casey
75b08bb5c9 Merge pull request #13025 from lm40/master 
Makes stomach noises save
 2022-06-04 16:18:59 +00:00
Casey
d3e0d8524c pAI and emote tweaks and upgrades 2022-06-04 10:00:21 +00:00
Razgriz
ee099334c3 Merge pull request #4310 from Cyrelius/master 
Un-nerfs the Prommie blobs
 2022-05-31 17:31:34 -07:00
Nadyr
b618cdcb9c Merge pull request #4304 from CHOMPStation2/upstream-merge-13013 
[MIRROR] TGUI API improvements port
 2022-05-31 03:36:52 -04:00
Nadyr
4a20b3dd87 Merge pull request #4306 from CHOMPStation2/upstream-merge-13015 
[MIRROR] Makes ATMs more intuitive
 2022-05-31 02:41:58 -04:00
Nadyr
818157ccca Merge pull request #4302 from CHOMPStation2/upstream-merge-13012 
[MIRROR] Stobarico's Fluff Item
 2022-05-31 02:34:18 -04: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
Casey
839441f481 Merge pull request #13015 from lm40/master 
Makes ATMs more intuitive
 2022-05-29 17:46:21 +00:00
Casey
a08c985862 TGUI API improvements port 2022-05-29 17:45:10 +00:00
Casey
8a2511e1b3 Merge pull request #13012 from stobarico/master 
Stobarico's Fluff Item
 2022-05-29 17:43:59 +00:00
Casey
bd6aa32092 Merge pull request #13011 from FunnyCatEnjoyer/FunnyCat 
Another typo on Fifi's fluff item. This time it should work.
 2022-05-29 17:41:48 +00: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
TheGreatKitsune
ce8b98f2ee fixes for two communication bugs and feature added for ghosts in belly 2022-05-28 00:50:34 -05:00
Nadyr
e5536c50a7 Merge pull request #4260 from CHOMPStation2/upstream-merge-12858 
[MIRROR] (Stocks) UI Migration & Bugfix
 2022-05-27 16:22:03 -04:00
Nadyr
1a931ccab3 Merge pull request #4290 from CHOMPStation2/upstream-merge-12996 
[MIRROR] Ports card icons from Eris. Implements them for VOREStation
 2022-05-27 16:21:23 -04: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
Nadyr
540f40d0f2 Merge pull request #4283 from CHOMPStation2/upstream-merge-13002 
[MIRROR] Plating can be built on most ground turfs.
 2022-05-27 16:18:08 -04:00
Nadyr
9aa6caaedb Merge pull request #4282 from CHOMPStation2/upstream-merge-13000 
[MIRROR] A couple more engineering QoL changes.
 2022-05-27 16:17:18 -04:00
Nadyr
be2e7842b1 Merge branch 'master' into upstream-merge-12996 2022-05-27 16:08:25 -04:00
Nadyr
68a25ca178 Merge pull request #4280 from CHOMPStation2/upstream-merge-12997 
[MIRROR] Changes Schnapsen loadout description
 2022-05-27 16:07:29 -04:00
Nadyr
af6a481f51 Merge pull request #4278 from CHOMPStation2/upstream-merge-12994 
[MIRROR] Fixes typo in Fifi's fluff loadout
 2022-05-27 16:01:32 -04:00
Nadyr
31bb156e18 Merge pull request #4285 from CHOMPStation2/upstream-merge-13004 
[MIRROR] custom item stuff ahead of explo removeal
 2022-05-27 15:59:36 -04:00
Nadyr
f8a0135fa9 Merge pull request #4284 from CHOMPStation2/upstream-merge-13003 
[MIRROR] Fixes numbing_belly/painkillers NOT blocking shock messages
 2022-05-27 15:59:04 -04:00
Nadyr
c75225ef09 powder that makes you say yes 2022-05-27 15:51:56 -04:00
Nadyr
c94c50e953 powder that makes you say yes 2022-05-27 15:49:17 -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
62c04f34d1 Ports card icons from Eris. Implements them for VOREStation 2022-05-22 22:11:13 +00:00
Casey
a318b9be4c Merge pull request #13004 from TheDavestDave/amor-stuffs 
custom item stuff ahead of explo removeal
 2022-05-22 18:32:21 +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
Casey
501bb21152 Plating can be built on most ground turfs. 2022-05-22 18:30:08 +00:00
Casey
4aa0977f19 A couple more engineering QoL changes. 2022-05-22 18:24:54 +00:00
Casey
3246c587a8 Changes Schnapsen loadout description 2022-05-22 18:22:42 +00:00
Casey
0b78f2647c Merge pull request #12953 from FartMaster69420/sleevecard-pai 
Sleevecard simplification and features
 2022-05-22 18:17:28 +00:00
Casey
360c2f6308 Fixes typo in Fifi's fluff loadout 2022-05-22 18:17:22 +00:00
Razgriz
7e9b5e592f Merge pull request #4277 from Rykka-Stormheart/shep-dev-gun-fixy 
Missing Gun Sprite Fixes
 2022-05-21 18:59:25 -07:00
Rykka
553f1bba47 Missing Gun Sprite Fixes 
- Fixes C20R missing sprite when empty
- Fixes Z8/Z9 missing sprite when empty
- Fixes Laser Cannon not having a sprite at all
- Fixes Xray Laser not having a sprite at all
- Fixes Anti-Particle Weapons (yes all of them) not having sprites
- Fixes Alien Pistol missing sprite + missing beam
- Fixes Mini-Uzi missing sprite when magazine removed/empty

Fixes https://github.com/CHOMPStation2/CHOMPStation2/issues/4101
 2022-05-21 17:17:12 -06: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
1801cf5100 Merge pull request #4271 from CHOMPStation2/Razgriz1032-patch-4 
Revitalizes Improved Physics
 2022-05-20 03:02:05 -07:00
Razgriz
e37400e1ac Merge pull request #3064 from Rykka-Stormheart/shep-dev-ambience-3.0 
Update Ambient Sounds 3.0
 2022-05-18 21:42:59 -07:00
Razgriz
f8832218e4 Merge pull request #4267 from CHOMPStation2/upstream-merge-12982 
[MIRROR] Fixes dumb cat mistakes
 2022-05-18 21:42:27 -07:00
Razgriz
6802c43719 Revitalizes Improved Physics 2022-05-18 21:32:21 -07:00
Razgriz
7a1b5a2660 Merge pull request #4264 from CHOMPStation2/power-cell-restoration 
Restore power cell sprite to "V2" and add cells to protolathe
 2022-05-18 14:51:27 -07:00