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,162 Commits 6 Branches 0 Tags
e70d9f291c66cdeddb7563e583fc17d9310dbd62
Commit Graph

30188 Commits

Author SHA1 Message Date
Nadyr
60fa095962 Merge pull request #2488 from CHOMPStationBot/upstream-merge-10993 
[MIRROR] Stack Examine Improvements, Log Examine Fix
 2021-07-10 01:47:29 -04:00
Nadyr
48c609ddca Merge pull request #2487 from CHOMPStationBot/upstream-merge-10988 
[MIRROR] Fixes #10885
 2021-07-10 01:38:31 -04:00
Nadyr
d387f35b03 Merge pull request #2485 from CHOMPStationBot/upstream-merge-10990 
[MIRROR] Show proper original name on 'un-revealed' ships
 2021-07-10 01:36:16 -04:00
Nadyr
3f5ea2e9f5 Merge pull request #2471 from CHOMPStationBot/upstream-merge-10976 
[MIRROR] Fixes blood being not injectable in any container of /food subtype
 2021-07-10 01:35:52 -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
2a02b34efc Merge pull request #2480 from CHOMPStationBot/upstream-merge-10981 
[MIRROR] Fixes #10947, adds labels for alt. bottles.
 2021-07-10 01:31:23 -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
913a84eb5c Merge branch 'master' into upstream-merge-10976 2021-07-10 01:22:38 -04:00
Nadyr
7cd8d9c093 powder that makes you say yes 2021-07-10 01:18:41 -04:00
Nadyr
eafe24872c Merge pull request #2468 from CHOMPStationBot/upstream-merge-10972 
[MIRROR] Fixes #10941
 2021-07-10 01:14:01 -04:00
Nadyr
b75fc136c1 Merge pull request #2465 from CHOMPStationBot/upstream-merge-10969 
[MIRROR] Make the sun bleed even better
 2021-07-10 00:35:16 -04:00
Nadyr
e48d0aa61c Merge pull request #2463 from CHOMPStationBot/upstream-merge-10971 
[MIRROR] 4 random runtime fixes
 2021-07-10 00:00:30 -04:00
Nadyr
9583078357 Merge branch 'master' into upstream-merge-10969 2021-07-09 23:49:21 -04:00
Nadyr
3ca4336586 Merge pull request #2464 from CHOMPStationBot/upstream-merge-10970 
[MIRROR] Fixes #10967
 2021-07-09 23:47:40 -04:00
Nadyr
685a01907f powder that makes you say yes 2021-07-09 23:46:36 -04:00
Nadyr
cf3eb9f54b Merge pull request #2462 from CHOMPStationBot/upstream-merge-10961 
[MIRROR] Bleed outdoor light onto walls and such
 2021-07-09 23:45:15 -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
Nadyr
fcac8b3cd1 powder that makes you say yes 2021-07-09 23:05:19 -04:00
Nadyr
b8445e3b49 powder that makes you say yes 2021-07-09 23:04:18 -04:00
Nadyr
573006ca86 powder that makes you say yes 2021-07-09 23:01:43 -04:00
Nadyr
a768e3a8f9 powder that makes you say yes 2021-07-09 22:53:31 -04:00
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
Aronai Sieyes
205ef740bd Merge pull request #10993 from MarinaGryphon/issue/logpile 
Stack Examine Improvements, Log Examine Fix
 2021-07-09 16:19:16 +00:00
Aronai Sieyes
c495e183a8 Merge pull request #10988 from MarinaGryphon/issue/10885 
Fixes #10885
 2021-07-09 16:18:08 +00:00
Aronai Sieyes
bffb395897 Merge pull request #10990 from VOREStation/Arokha/dis 
Show proper original name on 'un-revealed' ships
 2021-07-09 16:17:54 +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
5f4e486b5e Merge pull request #10981 from MarinaGryphon/issue/10947 
Fixes #10947, adds labels for alt. bottles.
 2021-07-09 16:15:19 +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
Chompstation Bot
e8c29d4d74 Fixes blood being not injectable in any container of /food subtype 2021-07-08 06:48:44 +00:00
Aronai Sieyes
2e31d368e7 Merge pull request #10972 from VOREStation/Fixes/10941 
Fixes #10941
 2021-07-08 05:04:49 +00:00
Chompstation Bot
9a9da55cd2 Make the sun bleed even better 2021-07-08 04:54:20 +00:00
Aronai Sieyes
9fe03ccfe2 Merge pull request #10970 from VOREStation/Fixes/10967 
Fixes #10967
 2021-07-08 04:54:13 +00:00
Chompstation Bot
b965d1546c 4 random runtime fixes 2021-07-08 04:54:06 +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
3d1b39fffa Merge branch 'master' into upstream-merge-10961 2021-07-08 00:09:21 -04:00
Nadyr
eecb117b83 Merge pull request #2461 from CHOMPStationBot/upstream-merge-10955 
[MIRROR] Fixup fake sun to work like planetary lights
 2021-07-08 00:08:20 -04:00
Nadyr
df5558dde1 powder that makes you say yes 2021-07-08 00:05:58 -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
3dc8f881b4 Merge pull request #2457 from CHOMPStationBot/upstream-merge-10956 
[MIRROR] Mobs with AI try to stab you when you eat them
 2021-07-08 00:00:47 -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
8b67f6b69d Merge pull request #2451 from CHOMPStationBot/upstream-merge-10949 
[MIRROR] More painting tweaks
 2021-07-07 23:56:53 -04:00
Nadyr
a646fe3bd4 Merge pull request #2450 from CHOMPStationBot/upstream-merge-10944 
[MIRROR] Lazy attempt at eating micros inside food
 2021-07-07 23:56:29 -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
2537a89bc6 Merge pull request #2445 from CHOMPStationBot/upstream-merge-10936 
[MIRROR] Fixes packaged burger sprite
 2021-07-07 23:53:20 -04:00