cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
63,615 Commits 5 Branches 0 Tags
bc6564deb6718c002256e43f1ae5772272efcf91
Commit Graph

12509 Commits

Author SHA1 Message Date
Aronai Sieyes
bc6564deb6 Merge pull request #10335 from VOREStation/Arokha/dels 
Various qdel helpers
 2021-05-20 19:05:42 +00:00
Razgriz
62694cd3d5 Merge pull request #1969 from Cyrelius/Cyrelius-Medihound-fix 
Fix Medihounds having only 2 uses of Trauma kits, burn kits, etc.
 2021-05-19 06:24:37 -07:00
tyger
817d163c1c there, i guess 2021-05-19 10:49:59 +02:00
Cyrelius
eacaceeb5b Fix Medihounds having only 2 uses of Trauma kits, burn kits, and clotting kits. 
This change fixes another one in  954412a26a  that reduced Medihound's medical supplies seemingly unintentionally.
 2021-05-17 16:37:55 -07:00
Novacat
b28bf70a2f Merge pull request #10345 from Heroman3003/spdrfix 
Fixes pixel offsets resetting on Giant Spider Queen
 2021-05-17 19:53:41 +00:00
Novacat
d5a6cb16a3 Merge pull request #10332 from VOREStation/Arokha/emoflip 
Touch up emote port
 2021-05-15 15:13:23 +00:00
Nadyr
bddfb995a2 Merge pull request #1912 from CHOMPStationBot/upstream-merge-10222 
[MIRROR] Catalogue Entries V1
 2021-05-14 01:15:36 -04:00
Nadyr
5fe4f38477 grammar 2021-05-14 01:04:42 -04:00
Nadyr
5dcb7f09fb grammar 2021-05-14 01:03:06 -04:00
Nadyr
c2d4da4ac2 grammar 2021-05-14 01:00:16 -04:00
Nadyr
ecd8f1e73a grammar 2021-05-14 00:59:12 -04:00
Nadyr
3b84b864f2 powder that makes you say yes 2021-05-14 00:57:58 -04:00
Nadyr
ea6f0fa259 powder that makes you say yes 2021-05-14 00:54:36 -04:00
Nadyr
458df58b2c Merge pull request #1943 from CHOMPStation2/PredPois 
Pred POI's
 2021-05-13 23:29:26 -04:00
Novacat
966de75a6c Merge pull request #10313 from TheFurryFeline/patch-31 
Stop SSD Snorers
 2021-05-13 02:53:39 +00:00
Nadyr
b48dd8fa43 Merge pull request #1948 from CHOMPStationBot/upstream-merge-10311 
[MIRROR] RE-ADDS SQUISH
 2021-05-12 18:48:21 -04:00
Nadyr
97dfe1fec8 Merge pull request #1942 from CHOMPStationBot/upstream-merge-10298 
[MIRROR] Tweak synth stuff
 2021-05-12 18:45:12 -04:00
Nadyr
31b47bc0d1 powder that makes you say yes 2021-05-12 18:20:23 -04:00
Nadyr
2a16c0d6e5 powder that makes you say yes 2021-05-12 18:18:47 -04:00
Nadyr
3bce32f1e0 powder that makes you say yes 2021-05-12 18:15:43 -04:00
Nadyr
294abf2ee2 powder that makes you say yes 2021-05-12 18:12:16 -04:00
Nadyr
c6572af5de powder that makes you say yes 2021-05-12 18:10:59 -04:00
Nadyr
ccc7fbab62 powder that makes you say yes 2021-05-12 18:09:36 -04:00
Novacat
18c1f3b275 Merge pull request #10311 from lm40/master 
RE-ADDS SQUISH
 2021-05-12 17:56:56 +00:00
Nadyr
600122cfb3 Merge pull request #1883 from CHOMPStationBot/upstream-merge-10256 
[MIRROR] Adds various new fat taur variants
 2021-05-12 03:39:34 -04:00
Nadyr
90b4274f92 Remove redundacies due to upstream port 2021-05-12 03:26:44 -04:00
Nadyr
cec14aa590 Update human.dm 2021-05-11 23:00:14 -04:00
Chompstation Bot
d7f20396de Personal crafting & Dependencies 2021-05-11 22:43:33 -04:00
Duriel Levara
72d5be162d Pred POI's 
Adds two more wilderness POI's that has two very hungry large preds~
 2021-05-11 19:52:20 -04:00
Razgriz
ba57743592 Merge branch 'master' into upstream-merge-10298 2021-05-11 15:58:14 -07:00
Razgriz
e57b2771e0 Update human_helpers.dm 2021-05-11 15:57:47 -07:00
Chompstation Bot
a06e872c51 Tweak synth stuff 2021-05-11 22:04:18 +00:00
Unknown
fd3a02f318 Fixes SSMobs Shattering due to Proteans 
Port of https://github.com/PolarisSS13/Polaris/pull/8073
 2021-05-11 03:31:24 -05:00
Nadyr
88b1b04bd8 Merge branch 'master' into upstream-merge-10247 2021-05-10 01:30:24 -04:00
ZVB334
ac9b79b737 Commented out sneeze because sneezeb was causing issues, ie, getting cut off 2021-05-09 16:31:36 -05:00
Nadyr
b5566ff403 Merge pull request #1914 from CHOMPStationBot/upstream-merge-10268 
[MIRROR] Adds a big batch of mobs to maint pred pool
 2021-05-09 07:47:25 -04:00
Nadyr
0f2b8e57a4 Merge pull request #1880 from CHOMPStationBot/upstream-merge-10248 
[MIRROR] [MIRROR] Swaps emote(me) out for custom_emote().
 2021-05-09 07:39:11 -04:00
Nadyr
08fac1ebbe Update giant_spider_vr.dm 2021-05-09 07:36:31 -04:00
Nadyr
aef0b3ab2c Update emote.dm 2021-05-09 07:07:43 -04:00
Nadyr
2ddabe9183 Update emote.dm 2021-05-09 06:59:06 -04:00
Nadyr
e754329bdb Update teshari.dm 2021-05-09 06:57:16 -04:00
Nadyr
688acf0711 Update species.dm 2021-05-09 06:48:55 -04:00
Nadyr
baf0aae073 Update species.dm 2021-05-09 06:42:43 -04:00
Nadyr
e75a3b1354 Update emote_vr.dm 2021-05-09 06:36:29 -04:00
Nadyr
e0f6cb84c9 Merge branch 'master' into upstream-merge-10050 2021-05-09 06:13:32 -04:00
Chompstation Bot
78593f1c11 Adds a big batch of mobs to maint pred pool 2021-05-09 01:37:07 +00:00
Nadyr
1cbf5d65ac Merge pull request #1903 from CHOMPStationBot/upstream-merge-8912 
[MIRROR] Fix view spinning reversing movement controls
 2021-05-08 08:02:22 -04:00
Nadyr
37285e87dd Merge pull request #1906 from CHOMPStationBot/upstream-merge-10250 
[MIRROR] Remove the lore blurb that pollutes the new player menu
 2021-05-08 07:57:36 -04:00
Nadyr
0ec2104c69 Merge pull request #1902 from CHOMPStationBot/upstream-merge-9254 
[MIRROR] Rabbits don't bumpnom anymore
 2021-05-08 07:52:23 -04:00
Nadyr
70840e8d6b Merge pull request #1886 from CHOMPStationBot/upstream-merge-10252 
[MIRROR] Fixes carbon shadekin traits
 2021-05-08 06:43:55 -04:00