cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
82,927 Commits 8 Branches 0 Tags
408eeaa5d18421b45e40cbbccd4c06d684fd5dce
Commit Graph

1095 Commits

Author SHA1 Message Date
Nadyr
53c15bd4f3 powder that makes you say yes 2021-09-28 23:41:35 -04:00
Chompstation Bot
a7365de5be Eng/Med Belts 2021-09-29 02:41:07 +00:00
Chompstation Bot
ad57dfbb92 Adds more clothing from Polaris and various sources 2021-09-27 18:31:54 +00:00
Nadyr
be5b7f3644 Merge pull request #2895 from CHOMPStationBot/upstream-merge-11466 
[MIRROR] Expanding Clothing Options
 2021-08-26 20:50:04 -04:00
Chompstation Bot
3a63117151 Expanding Clothing Options 2021-08-26 15:44:22 +00:00
Chompstation Bot
af0d7a0f6b Make stack amount var private 2021-08-26 15:39:04 +00:00
Nadyr
67eaef4886 Merge branch 'master' into upstream-merge-11464 2021-08-25 23:32:47 -04:00
Nadyr
0d3076d6b4 Merge pull request #2867 from cadyn/upstream-merge-11408 
Merge Upstream Pull Request 11408
 2021-08-25 21:59:52 -04:00
Nadyr
ad5441a144 powder that makes you say yes 2021-08-25 21:25:20 -04:00
Nadyr
835c587224 Merge pull request #2866 from cadyn/upstream-merge-11404 
Merge Upstream Pull Request 11404
 2021-08-25 21:23:07 -04:00
Aronai Sieyes
e19a87e44a Upstream-11408 2021-08-24 21:09:43 -07:00
Aronai Sieyes
ed4e55f811 Merge pull request #11404 from VOREStation/Arokha/fridge 
Fridge/wall locker animation fixes
 2021-08-24 21:09:22 -07:00
Nadyr
88ea62510a Merge branch 'master' into upstream-merge-11459 2021-08-24 23:23:57 -04:00
Nadyr
a7af370a6d powder that makes you say yes 2021-08-24 23:17:52 -04:00
Aronai Sieyes
c1632a1c71 Merge pull request #11439 from PastelPrinceDan/rdlabcoat 
Ports RD labcoat from CitRP
 2021-08-24 23:06:09 -04:00
Chompstation Bot
e209b4cfb2 Adds winter coats to their respective lockers/vendors 2021-08-24 23:59:02 +00:00
Chompstation Bot
593dd3ea79 Stun Revolver Fix 2021-08-24 23:58:41 +00:00
Chompstation Bot
f5212e0053 Fix Salamanders and Wall-lockers 2021-08-13 15:40:58 +00:00
Aronai Sieyes
7463a1bd6e Merge pull request #11368 from VOREStation/Arokha/closetanim 
Port of monster860's animated doors to Bay closets
 2021-08-09 03:28:57 +00:00
Nadyr
aa3c056af6 powder that makes you say yes 2021-08-01 15:11:58 -04:00
Chompstation Bot
4090222cda Janitor Equipment Fix 2021-08-01 14:45:35 +00:00
Nadyr
5c7226fa54 Merge branch 'master' into upstream-merge-11110 2021-07-16 19:09:43 -04:00
Chompstation Bot
d0d23ed393 Fixes a bunch of bools missed in #11100 2021-07-16 21:12:20 +00:00
Chompstation Bot
481c0e314e Convert some bools to TRUE/FALSE instead of 1/0. 2021-07-16 17:44:40 +00:00
Chompstation Bot
b974746755 Add a lot of clothes/armor/suits/spacesuits/rigs 2021-07-14 22:44:11 -04:00
Nadyr
7438d0f486 Merge pull request #2453 from CHOMPStationBot/upstream-merge-10948 
[MIRROR] Adds a weretiger.
 2021-07-08 00:15:00 -04:00
Chompstation Bot
28c2ee46d3 Adds a weretiger. 2021-07-07 21:08:45 +00:00
Aronai Sieyes
1deccaed87 Merge pull request #10931 from Very-Soft/ghostlyanimals 
Makes ghosts able to play as some mobs sometimes
 2021-07-07 18:37:53 +00:00
Chompstation Bot
087c7b63be [MIRROR] Refactors posters to use decls 2021-06-21 02:22:59 +00:00
Razgriz
fe6a182d07 Merge pull request #2228 from CHOMPStationBot/upstream-merge-10684 
[MIRROR] Fixes Field Medic Lockers
 2021-06-18 19:11:42 -07:00
Novacat
d8bc9dec51 Merge pull request #10684 from Novacat/nova-basicfixes 
Fixes Field Medic Lockers
 2021-06-18 18:02:30 +00:00
Chompstation Bot
55e3dc7904 Port current /tg/ lighting system 2021-06-18 04:23:09 +00:00
Aronai Sieyes
2748b83176 Merge pull request #10615 from KillianKirilenko/kk-fixes 
Explo/SAR Locker Tweak
 2021-06-11 19:12:38 +00:00
Nadyr
59fd206160 powder that makes you say yes 2021-06-02 00:34:43 -04:00
Nadyr
ce20d09e0c Merge pull request #2054 from CHOMPStationBot/upstream-merge-10433 
[MIRROR] [MIRROR] Linter Introduction + Cleanup
 2021-05-27 21:35:05 -04:00
Chompstation Bot
20e3b0a2d3 [MIRROR] Linter Introduction + Cleanup 2021-05-27 16:31:50 +00:00
Chompstation Bot
d52c1e61e8 Aro shipself v3 2021-05-27 01:10:08 +00:00
Nadyr
ab64d36f4c Merge pull request #2001 from CHOMPStationBot/upstream-merge-10382 
[MIRROR] Add mapping units/beacons for explo
 2021-05-23 23:05:44 -04:00
Novacat
9f795e904f Merge pull request #10396 from VOREStation/upstream-merge-8093 
[MIRROR] Wall Locker Adjustments
 2021-05-24 02:50:17 +00:00
Chompstation Bot
4d73aa5aca Add mapping units/beacons for explo 2021-05-22 21:48:00 +00:00
Chompstation Bot
c4161dc8d0 Adds some fennec treats 2021-05-20 19:55:01 +00:00
Nadyr
4764d593cb Merge pull request #1975 from CHOMPStationBot/upstream-merge-10339 
[MIRROR] Ports the Baystation Pilot Helmets
 2021-05-19 10:06:27 -04:00
Chompstation Bot
c4aaf54601 Ports the Baystation Pilot Helmets 2021-05-18 12:34:21 +00:00
Novacat
23d3beed44 Merge pull request #10344 from KillianKirilenko/kk-misc2 
Explorer/Pilot ID & Locker Addons
 2021-05-17 16:55:19 +00:00
Novacat
2027165318 Merge pull request #10257 from Novacat/nova-ert 
Changes some Exploration Colors
 2021-05-11 13:07:03 +00:00
Chompstation Bot
2d30c1c04e Exploration Balance Tweaks 2021-04-26 18:14:21 +00:00
Chompstation Bot
2856028342 Captain's Rapier 2021-04-20 16:50:56 +00:00
Novacat
93b480e5fb Merge pull request #10149 from Novacat/nova-ert 
Replaces old pilot helmets
 2021-04-13 02:39:37 +00:00
Razgriz
e9cfca5370 Update misc_vr.dm 2021-03-31 02:18:45 -07:00
Chompstation Bot
07dcf04408 [MIRROR] Fixes Global and Fixes Eyes 2021-03-18 14:40:07 +00:00