cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-23 07:43:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
67,259 Commits 9 Branches 0 Tags
f58a3c742bdff8affc266ab45ede9780ccbd4025
Commit Graph

475 Commits

Author SHA1 Message Date
Nadyr
7600142bd1 powder that makes you say yes 2021-12-03 20:39:05 -05:00
Casey
97312b93c0 fixes the commonwealth engi RIG having the wrong crate 2021-12-03 07:18:09 +00:00
Nadyr
19246dbed1 Merge pull request #3165 from CHOMPStationBot/upstream-merge-11722 
[MIRROR] Hardwood Material Port
 2021-10-30 23:30:40 -04:00
Nadyr
b4c8211ef1 powder that makes you say yes 2021-10-30 23:05:20 -04:00
Chompstation Bot
ef6f631360 OFD Supply Packs 2021-10-30 21:25:39 +00:00
Chompstation Bot
da9e3383a8 Hardwood Material Port 2021-10-30 21:25:32 +00:00
Cyrelius
e079e7b68b Add Vox Civilian hardsuit to Cargo. 2021-10-15 22:07:41 -07:00
Cyrelius
3b5959834d Fixed a bug. 
Made a mistake, this fixes it.
 2021-10-14 21:55:56 -07:00
Cyrelius
a498dcda7c Fixing a mistake. 
Thanks Demintika
 2021-10-11 02:25:52 -07:00
Cyrelius
235f929642 Revert and adjust stupid YW change. 
YW removed the better breacher suit, and that was dumb.  They're restrictive enough as-is.
 2021-10-11 01:45:08 -07:00
Chompstation Bot
ad57dfbb92 Adds more clothing from Polaris and various sources 2021-09-27 18:31:54 +00:00
Chompstation Bot
3a63117151 Expanding Clothing Options 2021-08-26 15:44:22 +00:00
Rykka
0151c0ad23 Change Commonwealth References added by #2553 to Solgov 
https://github.com/CHOMPStation2/CHOMPStation2/pull/2553

Added Commonwealth voidsuits from Bay.

Changed these to Solgov to address https://github.com/CHOMPStation2/CHOMPStation2/issues/2598

<3
 2021-08-15 15:34:30 -07:00
Chompstation Bot
ae737fe4a1 Add arcadey carpets 2021-07-29 20:10:19 +00:00
Chompstation Bot
d0d23ed393 Fixes a bunch of bools missed in #11100 2021-07-16 21:12:20 +00:00
Chompstation Bot
3d2783aec7 Ports new Bay SolGov suits as Commonwealth suits 2021-07-15 19:29:34 -04:00
Chompstation Bot
b974746755 Add a lot of clothes/armor/suits/spacesuits/rigs 2021-07-14 22:44:11 -04:00
Novacat
29b5b3bf05 Merge pull request #10995 from Enzo-Leon/medical_tools 
Properly Adds Bio-Regenerator to Surgery Bag
 2021-07-09 18:24:29 +00:00
Chompstation Bot
28c2ee46d3 Adds a weretiger. 2021-07-07 21:08:45 +00:00
Chompstation Bot
70167dde60 Add painting tools for more ART 2021-07-05 16:40:36 +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
Nadyr
a02607fe5a Merge branch 'master' into upstream-merge-10708 2021-06-19 22:03:34 -04:00
Nadyr
f0c2544f17 Merge pull request #2231 from CHOMPStationBot/upstream-merge-10652 
[MIRROR] Porting Over De-Husking Surgery
 2021-06-19 21:58:37 -04:00
Chompstation Bot
d582dd49aa Phaser handbow crate name change 2021-06-20 00:46:12 +00:00
Chompstation Bot
4b89d37b6d Porting Over De-Husking Surgery 2021-06-18 21:07:55 +00:00
Novacat
fafe1bc65c Merge pull request #10657 from TheDavestDave/phaser-handbow 
adds the phaser handbow
 2021-06-17 19:50:01 +00:00
Novacat
21dc916a5b Merge pull request #10644 from VOREStation/upstream-merge-8129 
[MIRROR] leg holsters in cargo crate
 2021-06-14 11:55:39 +00:00
Nadyr
bf5a11da8d Merge branch 'master' into upstream-merge-10578 2021-06-07 19:20:23 -04:00
Chompstation Bot
a6ce064280 Put the music speakers in crates! 2021-06-07 04:49:25 +00:00
Chompstation Bot
190a2c3bb3 Portable music player, remote jukebox speaker 2021-06-06 05:25:40 +00:00
Nadyr
752123834b Merge pull request #2107 from CHOMPStationBot/upstream-merge-10518 
[MIRROR] Ports musical instruments from /tg/
 2021-06-02 02:54:38 -04:00
Nadyr
cbd3444841 powder that makes you say yes 2021-06-02 00:29:02 -04:00
Chompstation Bot
eb03a53185 Ports musical instruments from /tg/ 2021-06-01 20:29:51 +00:00
Novacat
08180ba0f1 Merge pull request #10409 from TheDavestDave/master 
explo vender stuff
 2021-06-01 14:58:32 +00:00
Chompstation Bot
92c2ebed60 [MIRROR] Voidsuit Balance Overhaul 2021-05-29 19:32:08 +00:00
Novacat
238d8f2a2b Merge pull request #10413 from KillianKirilenko/kk-suits2 
Expedition Medic Cargo Crate
 2021-05-25 18:15:23 +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
Chompstation Bot
c4161dc8d0 Adds some fennec treats 2021-05-20 19:55:01 +00:00
Chompstation Bot
2612365204 [MIRROR] Brings back old tesh radsuit sprites, adds 'fitted' version. 2021-05-11 23:58:55 -04:00
Chompstation Bot
8ddc95a405 Adds pizza guy uniform 2021-05-11 13:06:38 +00:00
Nadyr
b25a19712f Merge pull request #1699 from CHOMPStationBot/upstream-merge-10043 
[MIRROR] Smole world beta Quick fix.
 2021-03-30 02:40:21 -04:00
Novacat
839b88c0fc Merge pull request #10043 from H0lySquirr3l/master 
Smole world beta Quick fix.
 2021-03-29 21:00:32 +00:00
Chompstation Bot
1ad694dcf0 [MIRROR] Repathed/renamed seromi to teshari. 2021-03-28 21:33:04 +00:00
Chompstation Bot
8db3a020a0 Micro March beta update. 2021-03-26 23:23:02 +00:00
Nadyr
c8321a53df Merge pull request #1617 from CHOMPStationBot/upstream-merge-9960 
[MIRROR] [MIRROR] Added Doctress' Jager drink.
 2021-03-21 04:31:54 -04:00
Chompstation Bot
2a5c21c8f5 [MIRROR] Kaleidoscope 2: The Retabbening 2021-03-21 01:24:14 -04:00
Novacat
f2fc4c8be7 Merge pull request #9960 from VOREStation/upstream-merge-7974 
[MIRROR] Added Doctress' Jager drink.
 2021-03-18 14:40:00 +00:00
Nadyr
604b71d59b Merge pull request #1539 from CHOMPStationBot/upstream-merge-9620 
[MIRROR] [MIRROR] Industrial Expansion
 2021-03-10 01:05:16 -05:00
Chompstation Bot
b85e9fc4d9 [MIRROR] Industrial Expansion 2021-03-09 21:53:03 +00:00