cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 20:52:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
65,015 Commits 6 Branches 0 Tags
7ddc05bfdace73b7534eadf1c1103a51b17d71ee
Commit Graph

30117 Commits

Author SHA1 Message Date
Nadyr
7ddc05bfda powder that makes you say yes 2021-07-09 21:57:23 -04:00
Nadyr
73196eaa8c powder that makes you say yes 2021-07-09 21:55:45 -04:00
Nadyr
21d2214bb3 powder that makes you say yes 2021-07-09 21:51:59 -04:00
Chompstation Bot
287a5deee3 Use material defines more 2021-07-07 19:02:05 +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
Nadyr
143ab9b942 Merge pull request #2432 from CHOMPStationBot/upstream-merge-10918 
[MIRROR] Remove unneeded update_icon() override
 2021-07-05 23:11:41 -04:00
Nadyr
beb9fc79b1 Merge pull request #2431 from CHOMPStationBot/upstream-merge-10921 
[MIRROR] Fix glass sheets construction menu
 2021-07-05 23:11:20 -04:00
Nadyr
9095728498 Merge pull request #2430 from CHOMPStationBot/upstream-merge-10922 
[MIRROR] Fix a mapper runtime
 2021-07-05 23:10:56 -04:00
Nadyr
0ed7d009d1 Merge pull request #2428 from CHOMPStationBot/upstream-merge-10925 
[MIRROR] Fixes #10919
 2021-07-05 23:10:13 -04:00
Nadyr
9c1d38ab7e Merge pull request #2427 from CHOMPStationBot/upstream-merge-10926 
[MIRROR] Fixes #10920
 2021-07-05 23:09:50 -04:00
Chompstation Bot
b99adcaca4 Add pouches! 2021-07-06 01:00:11 +00:00
Aronai Sieyes
1974a32d1e Merge pull request #10918 from VOREStation/Arokha/smartdrinksfix 
Remove unneeded update_icon() override
 2021-07-05 23:58:11 +00:00
Aronai Sieyes
68bf885c8e Merge pull request #10921 from VOREStation/Arokha/fixglass 
Fix glass sheets construction menu
 2021-07-05 23:58:05 +00:00
Aronai Sieyes
db80e6d647 Merge pull request #10922 from VOREStation/Arokha/mapper 
Fix a mapper runtime
 2021-07-05 23:57:58 +00:00
Aronai Sieyes
c449ea0a52 Merge pull request #10925 from VOREStation/Arokha/faxes 
Fixes #10919
 2021-07-05 23:57:46 +00:00
Aronai Sieyes
2ac3038712 Merge pull request #10926 from VOREStation/Arokha/announce 
Fixes #10920
 2021-07-05 23:57:40 +00:00
Aronai Sieyes
506d9d53f4 Merge pull request #10847 from MarinaGryphon/nailpolish 
Adds nail polish.
 2021-07-05 23:56:25 +00:00
Nadyr
0f1745dd3f Merge pull request #2423 from CHOMPStationBot/upstream-merge-10908 
[MIRROR] Converts visible_message notice spans to look more like emotes
 2021-07-05 18:43:53 -04:00
Nadyr
f2fe7aa004 powder that makes you say yes 2021-07-05 18:28:35 -04:00
Nadyr
ef70de4342 powder that makes you say yes 2021-07-05 18:22:18 -04:00
Chompstation Bot
14129d60cf Converts visible_message notice spans to look more like emotes 2021-07-05 20:30:12 +00:00
Aronai Sieyes
e9cb44d9ca Merge pull request #10898 from Heroman3003/incorporeal-fires 
Makes incorporeal things properly immune to bonfires and lava (and tram and elevator...)
 2021-07-05 20:26:01 +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
Nadyr
e2ce9a6fbf Merge pull request #2402 from Cyrelius/Cyrelius-patch-1 
Darksight improvement.
 2021-07-05 16:06:43 -04:00
Nadyr
221dffa8b9 Merge branch 'master' into upstream-merge-10905 2021-07-05 16:04:30 -04:00
Nadyr
4f5730fd8a powder that makes you say yes 2021-07-05 16:03:57 -04:00
Nadyr
5280baea21 powder that makes you say yes 2021-07-05 16:03:02 -04:00
Nadyr
51c62c4ce0 Merge branch 'master' into upstream-merge-10906 2021-07-05 15:59:26 -04:00
Nadyr
81be69c813 powder that makes you say yes 2021-07-05 15:58:21 -04:00
Nadyr
f9d4c77fe1 Merge pull request #2416 from CHOMPStationBot/upstream-merge-10909 
[MIRROR] Fixes a few issues with brackets being escaped when they shouldn't be.
 2021-07-05 15:56:53 -04:00
Nadyr
80cc3023ec Merge pull request #2414 from CHOMPStationBot/upstream-merge-10891 
[MIRROR] Split jumptomob() into do_jumptomob()
 2021-07-05 15:55:50 -04:00
Nadyr
2274c1a218 Merge pull request #2413 from CHOMPStationBot/upstream-merge-10892 
[MIRROR] Fix observer message lies
 2021-07-05 15:55:13 -04:00
Chompstation Bot
7ef11b40bf Fixes #10904 2021-07-05 16:20:05 +00:00
Chompstation Bot
e531aba8c1 Fix unused var warning 2021-07-05 16:19:57 +00:00
Chompstation Bot
6b6a138221 Fixes #10896 2021-07-05 16:19:51 +00:00
Aronai Sieyes
bcc80d1bbb Merge pull request #10909 from MarinaGryphon/bracketfixes 
Fixes a few issues with brackets being escaped when they shouldn't be.
 2021-07-05 16:17:41 +00:00
Aronai Sieyes
9d12c462b3 Merge pull request #10891 from VOREStation/Arokha/fixadminjump 
Split jumptomob() into do_jumptomob()
 2021-07-05 06:36:55 +00:00
Aronai Sieyes
e2ae927930 Merge pull request #10892 from VOREStation/Arokha/obsmessage 
Fix observer message lies
 2021-07-05 06:36:48 +00:00
Aronai Sieyes
90768085c8 Merge pull request #10890 from VOREStation/Arokha/hairfix 
Fixes #10884
 2021-07-05 06:32:31 +00:00
Cyrelius
7a7fd6e246 Update robot.dm 
Add Chompedit tags
 2021-07-04 19:11:26 -07:00
Cyrelius
0f8be36f1d Merge branch 'CHOMPStation2:master' into Cyrelius-patch-2 2021-07-04 16:31:29 -07:00
Nadyr
655884d2dc Merge pull request #2407 from CHOMPStationBot/upstream-merge-10868 
[MIRROR] Fix taur tail paths
 2021-07-04 19:15:39 -04:00
Nadyr
138e9b65a2 Merge pull request #2406 from CHOMPStationBot/upstream-merge-10867 
[MIRROR] Fix excessive table merge, convert climbers lazy
 2021-07-04 19:15:07 -04:00
Aronai Sieyes
3028575a34 Merge pull request #10868 from VOREStation/Fixes/10730 
Fix taur tail paths
 2021-07-04 22:48:17 +00:00
Aronai Sieyes
c30f4c2dbc Merge pull request #10867 from VOREStation/Fixes/10787 
Fix excessive table merge, convert climbers lazy
 2021-07-04 22:48:12 +00:00
Aronai Sieyes
4a7da468e3 Merge pull request #10877 from VOREStation/Fixes/multiz 
Fixes #10874, Fixes #10871
 2021-07-04 22:46:38 +00:00