cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-22 07:14:35 +00:00
Code Issues Packages Projects Releases Wiki Activity
65,400 Commits 8 Branches 0 Tags
5e56328007256be1fa9ccdeff091f5fcf08dfd15
Commit Graph

12769 Commits

Author SHA1 Message Date
Chompstation Bot
a7e5cce5b8 Tweak various sprites 'n things 2021-07-15 20:35:01 -04:00
Nadyr
20e6781341 Merge pull request #2553 from CHOMPStationBot/upstream-merge-11080 
[MIRROR] Ports new Bay SolGov suits as Commonwealth suits
 2021-07-15 20:26:17 -04:00
Nadyr
c9e21f2050 powder that makes you say yes 2021-07-15 19:47:36 -04:00
Nadyr
fc31a83e6a powder that makes you say yes 2021-07-15 19:45:46 -04:00
Chompstation Bot
3d2783aec7 Ports new Bay SolGov suits as Commonwealth suits 2021-07-15 19:29:34 -04:00
Nadyr
7e0df4d4ca Merge branch 'master' into upstream-merge-11065 2021-07-15 19:19:34 -04:00
Nadyr
951d4b303f Merge pull request #2528 from CHOMPStationBot/upstream-merge-11032 
[MIRROR] Add a lot of clothes/armor/suits/spacesuits/rigs
 2021-07-15 19:07:37 -04:00
Nadyr
14a2f2ce76 Merge pull request #2552 from CHOMPStationBot/upstream-merge-11087 
[MIRROR] Fix colorblind characters not seeing OL lights
 2021-07-15 19:02:07 -04:00
Nadyr
9e9a95b65f Merge pull request #2549 from CHOMPStationBot/upstream-merge-11077 
[MIRROR] [ready] being jittery or having a chemical speedboost removes spaces, commas, and semicolons from speech
 2021-07-15 19:00:39 -04:00
Nadyr
00cbea1f11 Merge pull request #2535 from Verkister/bellyrubbies 
Adds bellyrub mechanics
 2021-07-15 18:57:19 -04:00
Aronai Sieyes
93e51b2f82 Merge pull request #11087 from VOREStation/Fixes/11079 
Fix colorblind characters not seeing OL lights
 2021-07-15 19:03:01 +00:00
Hatterhat
3db7a26b1f [ready] being jittery or having a chemical speedboost removes spaces, commas, and semicolons from speech (#11077) 
* funny mode initialized

* i hate saycode, actually

* forgot a backspace

* IT WORKS WOO

Co-authored-by: Hatterhat <Hatterhat@users.noreply.github.com>
 2021-07-15 16:41:17 +00:00
Verkister
9c99a10c94 groining 2021-07-15 10:00:56 +03:00
Nadyr
832d529f7d Merge pull request #2546 from CHOMPStationBot/upstream-merge-11062 
[MIRROR] Synthetic resleeving notifications go to Science instead of Medical
 2021-07-14 22:47:22 -04:00
Nadyr
652981062c Merge pull request #2543 from CHOMPStationBot/upstream-merge-11069 
[MIRROR] Adds Hair Tie to all Species
 2021-07-14 22:45:20 -04:00
Nadyr
b78b65f9cb Merge pull request #2541 from CHOMPStationBot/upstream-merge-11067 
[MIRROR] Prevent Dionaea from being passively overfed.
 2021-07-14 22:45:01 -04:00
Chompstation Bot
b974746755 Add a lot of clothes/armor/suits/spacesuits/rigs 2021-07-14 22:44:11 -04:00
Nadyr
c52c0a0652 powder that makes you say yes 2021-07-14 22:24:10 -04:00
Aronai Sieyes
a93e6cd14c Merge pull request #11062 from MarinaGryphon/upgrade/sleeve-announce 
Synthetic resleeving notifications go to Science instead of Medical
 2021-07-14 18:39:32 +00:00
Chompstation Bot
57dee1e043 Adds Hair Tie to all Species 2021-07-14 18:13:45 +00:00
Chompstation Bot
9acb3a208e Removes unnecessary, unused, and redundant helpers. 2021-07-14 17:57:22 +00:00
Aronai Sieyes
18b0664ce8 Merge pull request #11067 from MarinaGryphon/bugfix/9643 
Prevent Dionaea from being passively overfed.
 2021-07-14 17:55:13 +00:00
Aronai Sieyes
dc83d28b20 Merge pull request #11063 from Verkister/patch-70 
Fixes corpses spamming empty ghosts
 2021-07-14 17:48:51 +00:00
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
Verkister
4d27dde687 Adds bellyrub mechanics 
Adds a bellyrub verb to manually trigger a belly processing cycle for the target's selected vorgan to help it process its contents faster using a lighter version of the regular belly cycle to avoid straining the subsystem. The bellyrubs can be accessed via an ability tab verb, and can also be easily applied by targeting groin for a hug alternative. This also works on simplemobs and simplemobs can also target groin on help intent to provide rubs.
Also fixes tamed oties smashing through shit that gets in their way.
 2021-07-13 19:44:54 +03: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