cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-06 07:23:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
68,946 Commits 7 Branches 0 Tags
97eccd40fa2f8aaea52482155bb8f053149b975c
Commit Graph

248 Commits

Author SHA1 Message Date
Casey
97eccd40fa Merge pull request #12659 from Very-Soft/tweaks 
Adjusts trees and vendor spawners
 2022-04-06 00:56:29 +00:00
Nadyr
a121954e24 Merge pull request #3992 from CHOMPStation2/upstream-merge-12592 
[MIRROR] The Grand /TG Port - Part 6
 2022-04-04 17:52:53 -04:00
Casey
de0be34c99 The Grand /TG Port - Part 6 2022-04-03 03:32:03 +00:00
Casey
60b1eeff99 Merge pull request #12579 from GhostActual/tg-port-5 
The Grand /TG Port - Part 5
 2022-04-03 03:30:56 +00:00
Razgriz
d85864e3e4 Merge pull request #3934 from CHOMPStation2/upstream-merge-12522 
[MIRROR] Firearms 1
 2022-03-27 16:41:35 -07:00
Casey
a20f1a7c2b Merge pull request #12541 from GhostActual/Firearms1 
Did a Whoops
 2022-03-26 04:43:06 +00:00
Nadyr
83caabb9c7 powder that makes you say yes 2022-03-25 18:32:51 -04:00
Casey
e71a04a991 Merge pull request #12504 from GhostActual/Robs-You-In-Public 
Robs You In Public
 2022-03-21 20:21:21 +00:00
Casey
8e0552a788 Colts, Revolvers, and Tasers 2022-03-20 03:10:23 +00:00
Casey
5510dbf441 Merge pull request #12392 from Heroman3003/cookiefix 
Brings REAL cookies to everywhere they belong
 2022-03-07 09:06:24 +00:00
Casey
80f5298a18 Ammo Boxes 2022-03-03 21:23:43 +00:00
Casey
a2646d37c5 Merge pull request #12319 from Very-Soft/trader 
Trader!
 2022-02-25 19:58:15 +00:00
Casey
3d6510f3ea Donk Co. Toys 2022-02-19 04:27:50 +00:00
Casey
80e943716f talon miner 2022-02-06 23:21:47 +00:00
Nadyr
46c47164ce powder that makes you say yes 2021-12-05 13:47:04 -05:00
Nadyr
1dc06fd9e6 Merge branch 'master' into upstream-merge-11928 2021-12-05 12:50:21 -05:00
Nadyr
1d43637079 Merge pull request #3236 from CHOMPStation2/upstream-merge-11906 
[MIRROR] Fixes another active edge trigger potential
 2021-12-05 12:15:52 -05:00
Nadyr
f9a407ba4b powder that makes you say yes 2021-12-05 12:00:39 -05:00
Nadyr
a8490c5623 powder that makes you say yes 2021-12-05 09:27:14 -05:00
Casey
fe8c4753eb Offmap Tweaks 2021-12-03 07:14:17 +00:00
BlackMajor
55e8bfa69d Simulated you dingus 2021-11-15 12:18:42 +13:00
BlackMajor
44d8d3245e quick mapping tool pr 2021-11-15 12:16:05 +13:00
Chompstation Bot
60de9a473c Stellar Delight! 2021-10-30 13:34:04 +00:00
Chompstation Bot
0fc8ba9656 Tool Time (Fixed) 2021-10-27 16:02:47 +00:00
Nadyr
0edc9e806f Merge pull request #3099 from CHOMPStationBot/upstream-merge-11578 
[MIRROR] [MIRROR] Misc runtime fixes
 2021-10-22 20:42:21 -04:00
Chompstation Bot
12b909e536 [MIRROR] Misc runtime fixes 2021-10-22 18:57:55 +00:00
Aronai Sieyes
116edd7995 Merge pull request #11543 from VOREStation/upstream-merge-8246 
[MIRROR] Random Spawner Stuff
 2021-10-22 18:23:30 +00:00
BlackMajor
9241013eae comments out dumb code 2021-09-10 02:07:37 +12:00
BlackMajor
464b3dc18e A couple of mapping helpers 2021-09-09 21:07:00 +12:00
Aronai Sieyes
e19a87e44a Upstream-11408 2021-08-24 21:09:43 -07:00
Aronai Sieyes
c03ad3a5d5 Merge pull request #11446 from VOREStation/upstream-merge-8216 
[MIRROR] Randomized Vendor Spawners for Mapping
 2021-08-25 00:00:16 +00:00
Chompstation Bot
0857ab35f3 Few more outdoors fixes 2021-08-01 16:26:38 +00:00
Aronai Sieyes
66669af98d Merge pull request #11170 from Heroman3003/thepurge 
Finishes purge of Industrial Expansion
 2021-07-20 14:46:30 +00:00
Chompstation Bot
16a731dd39 Move like every clothing icon file 2021-07-10 16:23:23 +00:00
Chompstation Bot
b99adcaca4 Add pouches! 2021-07-06 01:00:11 +00:00
Aronai Sieyes
d87b3c84e5 Merge pull request #10859 from VOREStation/Arokha/iconfixes 
Random item missing sprites
 2021-07-04 03:17:27 +00:00
Aronai Sieyes
64db1a458b Merge pull request #10802 from VOREStation/Icons/food 
Port several foods and food sprites
 2021-07-03 20:31:07 +00:00
Razgriz
f692192d2c Merge pull request #2276 from CHOMPStationBot/upstream-merge-10727 
[MIRROR] Medicine Tweaks
 2021-06-26 13:24:46 -07:00
Chompstation Bot
5cbb0e48e0 Medicine Tweaks 2021-06-23 16:35:01 +00:00
Chompstation Bot
fb343cec6c [MIRROR] Linter diagnostics + bans non-var relative pathing 2021-06-22 22:17:02 +00:00
Chompstation Bot
087c7b63be [MIRROR] Refactors posters to use decls 2021-06-21 02:22:59 +00:00
Aronai Sieyes
ac00965e68 cock 2021-06-19 22:03:38 -07:00
Aronai Sieyes
d72951047e Merge pull request #10569 from VOREStation/upstream-merge-8115 
[MIRROR] Random mob spawners can accept faction input now
 2021-06-07 05:13:13 +00:00
Novacat
5d69f8878d Merge pull request #10373 from ShadowLarkens/fix_vending 
Initialize all vending products on server start & fix multiple food icons
 2021-05-22 03:50:10 +00:00
Novacat
d9fb7b0a42 Merge pull request #10368 from VOREStation/upstream-merge-8083 
[MIRROR] Food 4 thought
 2021-05-21 20:00:24 +00:00
Novacat
b98bab980f Merge pull request #10351 from VOREStation/upstream-merge-8082 
[MIRROR] More Spawner Tweaks
 2021-05-18 12:32:05 +00:00
Chompstation Bot
d7f20396de Personal crafting & Dependencies 2021-05-11 22:43:33 -04:00
Nadyr
65946e5c49 Update misc.dm 2021-05-08 08:36:11 -04:00
Novacat
0e2ecee8a7 Merge pull request #10183 from VOREStation/upstream-merge-8034 
[MIRROR] Random spawner refactor.
 2021-04-21 06:30:26 +00:00
Chompstation Bot
76e61abca6 tram+station take 2 2021-04-05 05:30:18 +00:00