cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-04 14:33:58 +00:00
Code Issues Packages Projects Releases Wiki Activity
65,257 Commits 7 Branches 0 Tags
c22bbacc654bb152ccd99c0b50efa6ba4ab2cbb1
Commit Graph

12745 Commits

Author SHA1 Message Date
Nadyr
a803e5175f Merge pull request #2493 from CHOMPStationBot/upstream-merge-11002 
[MIRROR] Move like every clothing icon file
 2021-07-13 22:21:08 -04:00
Nadyr
ef1bf71166 powder that makes you say yes 2021-07-13 21:53:02 -04:00
Nadyr
f1591838ec Merge branch 'master' into upstream-merge-11024 2021-07-13 21:36:41 -04:00
Nadyr
1e84713413 powder that makes you say yes 2021-07-12 23:54:02 -04:00
Nadyr
914022e929 powder that makes you say yes 2021-07-12 23:29:20 -04:00
Nadyr
6f448d4464 powder that makes you say yes 2021-07-12 23:28:55 -04:00
Chompstation Bot
a6bd5ef3f1 Fixes weretiger default offset 2021-07-11 19:14:09 +00:00
Nadyr
796c58e062 Merge pull request #2497 from CHOMPStationBot/upstream-merge-10992 
[MIRROR] Allows players to name their mobs.
 2021-07-10 19:12:31 -04:00
Nadyr
9f16e43cee Update bigdragon_ch.dm 2021-07-10 18:49:59 -04:00
Nadyr
4d5795e77d implemented upstream 2021-07-10 18:45:15 -04:00
Aronai Sieyes
27545a7859 Merge pull request #11010 from VOREStation/Arokha/qpadlink 
Fix some bugs
 2021-07-10 20:12:23 +00:00
Aronai Sieyes
96d36049ca Merge pull request #10992 from Ketrai/tigtweaks 
Allows players to name their mobs.
 2021-07-10 19:42:42 +00:00
Chompstation Bot
16a731dd39 Move like every clothing icon file 2021-07-10 16:23:23 +00:00
Nadyr
48c609ddca Merge pull request #2487 from CHOMPStationBot/upstream-merge-10988 
[MIRROR] Fixes #10885
 2021-07-10 01:38:31 -04:00
Nadyr
5ff6ff058e Merge pull request #2484 from CHOMPStationBot/upstream-merge-10982 
[MIRROR] Port and move all the pets!!!
 2021-07-10 01:35:18 -04:00
Nadyr
49866902a7 Merge pull request #2479 from CHOMPStationBot/upstream-merge-10980 
[MIRROR] Expands do_after/do_mob exclusive var to affect target
 2021-07-10 01:30:52 -04:00
Nadyr
2cad763c26 Merge pull request #2447 from CHOMPStationBot/upstream-merge-10852 
[MIRROR] Use material defines more
 2021-07-09 23:22:03 -04:00
Aronai Sieyes
c495e183a8 Merge pull request #10988 from MarinaGryphon/issue/10885 
Fixes #10885
 2021-07-09 16:18:08 +00:00
Aronai Sieyes
2610db486f Merge pull request #10982 from VOREStation/Arokha/omnipets 
Port and move all the pets!!!
 2021-07-09 16:16:46 +00:00
Aronai Sieyes
f835374f26 Merge pull request #10980 from MarinaGryphon/issue/8289 
Expands do_after/do_mob exclusive var to affect target
 2021-07-09 16:14:12 +00:00
Nadyr
7438d0f486 Merge pull request #2453 from CHOMPStationBot/upstream-merge-10948 
[MIRROR] Adds a weretiger.
 2021-07-08 00:15:00 -04:00
Nadyr
2c1005a60f Merge pull request #2448 from CHOMPStationBot/upstream-merge-10937 
[MIRROR] Some plane tweaks.
 2021-07-08 00:14:47 -04:00
Nadyr
207513d17d Merge pull request #2443 from CHOMPStationBot/upstream-merge-10943 
[MIRROR] Fix a handful of ghost/admin verbs
 2021-07-08 00:01:14 -04:00
Nadyr
cbafdd15a0 Merge pull request #2456 from CHOMPStationBot/upstream-merge-10957 
[MIRROR] Simplemobs can do cool emotes now
 2021-07-08 00:00:23 -04:00
Nadyr
1212755f9c Merge pull request #2455 from CHOMPStationBot/upstream-merge-10953 
[MIRROR] Fix security cameras showing weird space thing
 2021-07-07 23:59:57 -04:00
Nadyr
74a5348126 Merge pull request #2449 from CHOMPStationBot/upstream-merge-10945 
[MIRROR] 4 fixes
 2021-07-07 23:55:47 -04:00
Nadyr
7846005ead powder that makes you say yes 2021-07-07 23:55:15 -04:00
Nadyr
56649cac06 Merge pull request #2439 from CHOMPStationBot/upstream-merge-10928 
[MIRROR] SSInput and Diagonal Movement
 2021-07-07 23:53:36 -04:00
Nadyr
b88233de91 powder that makes you say yes 2021-07-07 23:50:59 -04:00
Nadyr
89438f1256 Merge pull request #2440 from CHOMPStationBot/upstream-merge-10931 
[MIRROR] Makes ghosts able to play as some mobs sometimes
 2021-07-07 23:46:55 -04:00
Nadyr
97181764d3 powder that makes you say yes 2021-07-07 23:45:33 -04:00
Aronai Sieyes
d95001837b Merge pull request #10954 from Very-Soft/protectpoppyandchicks 
Protects Poppy and chicks from being vored
 2021-07-07 23:46:55 +00:00
Aronai Sieyes
f9c7593677 Merge pull request #10957 from Very-Soft/simplemobemotes 
Simplemobs can do cool emotes now
 2021-07-07 23:43:28 +00:00
Aronai Sieyes
378fd085fc Merge pull request #10953 from VOREStation/Arokha/seccamera 
Fix security cameras showing weird space thing
 2021-07-07 21:15:05 +00:00
Chompstation Bot
28c2ee46d3 Adds a weretiger. 2021-07-07 21:08:45 +00:00
Aronai Sieyes
afd142bd6a Merge pull request #10945 from VOREStation/Arokha/fixes333 
4 fixes
 2021-07-07 19:04:22 +00:00
Chompstation Bot
ef79e49ee2 Some plane tweaks. 2021-07-07 19:03:14 +00:00
Chompstation Bot
287a5deee3 Use material defines more 2021-07-07 19:02:05 +00:00
Chompstation Bot
b22cc8df95 Fix a handful of ghost/admin verbs 2021-07-07 18:39:12 +00:00
Aronai Sieyes
1deccaed87 Merge pull request #10931 from Very-Soft/ghostlyanimals 
Makes ghosts able to play as some mobs sometimes
 2021-07-07 18:37:53 +00:00
Chompstation Bot
1513fbe0cb SSInput and Diagonal Movement 2021-07-07 18:35:44 +00:00
Nadyr
7e10238662 Merge pull request #2409 from Cyrelius/Cyrelius-patch-2 
Doggo-borg improvements and AI shell options.
 2021-07-06 19:03:11 -04:00
Verkister
fbba26d1ba Fixes playercontrolled voremobs getting no belly 
Fixes playercontrolled voremobs not getting their belly loaded if the player opens vorepanel without triggering the mob's own init_vore beforehand.
 2021-07-06 22:09:41 +03:00
Nadyr
a2c1ee213a Merge pull request #2433 from CHOMPStationBot/upstream-merge-10927 
[MIRROR] Add pouches!
 2021-07-05 23:32:49 -04:00
Chompstation Bot
b99adcaca4 Add pouches! 2021-07-06 01:00:11 +00:00
Aronai Sieyes
506d9d53f4 Merge pull request #10847 from MarinaGryphon/nailpolish 
Adds nail polish.
 2021-07-05 23:56:25 +00:00
Chompstation Bot
14129d60cf Converts visible_message notice spans to look more like emotes 2021-07-05 20:30:12 +00:00
Nadyr
b40f14fc6b Merge pull request #2419 from CHOMPStationBot/upstream-merge-10905 
[MIRROR] Fixes #10904
 2021-07-05 16:19:36 -04:00
Nadyr
78698322b8 Merge pull request #2417 from CHOMPStationBot/upstream-merge-10907 
[MIRROR] Fixes #10896
 2021-07-05 16:19:18 -04:00
Nadyr
1a95ae8d0b Merge pull request #2418 from CHOMPStationBot/upstream-merge-10906 
[MIRROR] Fix unused var warning
 2021-07-05 16:08:07 -04:00