cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-05 23:13:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
65,183 Commits 7 Branches 0 Tags
54af7b4f8a0f8c0765cd9280eb799e6f25a29d1d
Commit Graph

44950 Commits

Author SHA1 Message Date
Aronai Sieyes
54af7b4f8a Merge pull request #11042 from VOREStation/Arokha/altstorage 
Storage alt-click support
 2021-07-12 23:46:27 +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
58f6f5a71a Merge pull request #2499 from CHOMPStationBot/upstream-merge-11010 
[MIRROR] Fix some bugs
 2021-07-10 18:47:04 -04:00
Nadyr
4d5795e77d implemented upstream 2021-07-10 18:45:15 -04:00
Nadyr
227212f81f Merge pull request #2496 from CHOMPStationBot/upstream-merge-10999 
[MIRROR] Fix admin VV lists
 2021-07-10 18:39:17 -04:00
Nadyr
bd5c4f1375 Merge pull request #2495 from CHOMPStationBot/upstream-merge-11006 
[MIRROR] Remove naughty KEEP_TOGETHER
 2021-07-10 18:38:53 -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
Aronai Sieyes
089cb5b064 Merge pull request #10999 from VOREStation/Arokha/fixadminlistedit 
Fix admin VV lists
 2021-07-10 19:42:35 +00:00
Aronai Sieyes
6ba41ed8e0 Merge pull request #11006 from VOREStation/Arokha/portalfix 
Remove naughty KEEP_TOGETHER
 2021-07-10 19:35:22 +00:00
Aronai Sieyes
b72abbcbe2 Merge pull request #11009 from Verkister/patch-68 
Fixes view range verb
 2021-07-10 15:16:09 +00:00
Nadyr
e70d9f291c Merge pull request #2489 from CHOMPStationBot/upstream-merge-10996 
[MIRROR] Fix bitwise ops broken in caee8d45
 2021-07-10 02:35:57 -04:00
Nadyr
b90a37b854 Merge pull request #2490 from CHOMPStationBot/upstream-merge-10995 
[MIRROR] Properly Adds Bio-Regenerator to Surgery Bag
 2021-07-10 01:47:51 -04:00
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
19630dcdcc Merge pull request #2477 from CHOMPStationBot/upstream-merge-10946 
[MIRROR] Makes time/tram use REALTIMEOFDAY rather than world.time
 2021-07-10 01:46:02 -04:00
Nadyr
ca3ccb5ff2 Merge branch 'master' into upstream-merge-10996 2021-07-10 01:42:08 -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
f27ac30e5a Merge pull request #2478 from CHOMPStationBot/upstream-merge-10979 
[MIRROR] Port current SSgarbage from /tg/
 2021-07-10 01:37:07 -04:00
Nadyr
c229da42a6 Merge pull request #2486 from CHOMPStationBot/upstream-merge-10989 
[MIRROR] Fixes pocky having no sprite.
 2021-07-10 01:36:36 -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
7476daf3f8 powder that makes you say yes 2021-07-10 01:29:23 -04:00
Nadyr
96f0ab5e37 powder that makes you say yes 2021-07-10 01:27:04 -04:00
Nadyr
7285e94ef0 powder that makes you say yes 2021-07-10 01:25:10 -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
d9dd108539 Merge pull request #2466 from CHOMPStationBot/upstream-merge-10963 
[MIRROR] Byond will never stop with this huh
 2021-07-10 00:45:05 -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
e0437a42f3 Merge pull request #2458 from CHOMPStationBot/upstream-merge-10952 
[MIRROR] Replaces monofloors with a decal and makes some floors not rotated
 2021-07-10 00:29:10 -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
211ed134b5 Merge branch 'CHOMPStation2:master' into upstream-merge-10952 2021-07-09 23:44:53 -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
Nadyr
627bc202a1 powder that makes you say yes 2021-07-09 21:47:50 -04:00
Nadyr
9a4fd9b210 powder that makes you say yes 2021-07-09 21:38:48 -04:00