cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-24 08:15:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
66,137 Commits 9 Branches 0 Tags
bdf7cff2232ebd1300ec8d898aaa763f8faf3bcb
Commit Graph

928 Commits

Author SHA1 Message Date
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
Chompstation Bot
cacb1f019d Gateway for Heads, Pilot to Civ 2021-03-08 16:05:16 +00:00
Chompstation Bot
ad57e1ad13 [MIRROR] Sideports a couple of init unit tests from Neb. 2021-02-27 18:45:36 +00:00
Novacat
ad8b82ce05 Merge pull request #9727 from VOREStation/upstream-merge-7844 
[MIRROR] Makes wrenches only anchor lockers if they're open
 2021-02-16 01:33:19 +00:00
Chompstation Bot
d3c7cc6040 New advanced Egg Release mechanics. 2021-02-01 19:35:41 +00:00
Shadow Quill
636278b1ac Adds EFTPOS scanners to security/warden lockers, and a few items as well 2021-01-28 20:22:21 -06:00
Razgriz
e67b668f6e Update detective wardrobe 
-Replaces black gloves with forensics gloves.
-Restores the gunbox
 2021-01-19 15:11:55 -07:00
Verkister
d7298336a8 Merge pull request #9242 from VOREStation/upstream-merge-7724 
[MIRROR] Wall Cabinets & Crate Markings
 2020-10-19 10:37:04 +00:00
Cadyn
07775449d7 Fixing conflicts 2020-10-05 18:10:53 -07:00
Killian
a639f767c9 talon cleanup/tweaks 2020-09-29 16:47:48 +01:00
Razgriz
54e632ebf2 September 2020 Upstream Merge 2020-09-25 23:07:08 -07:00
izac112
4b051c23fc Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-09-13 15:05:53 +02:00
Killian
eb8ecaddb2 hull/glass replacement, further polish, other misc tweaks 
also adds plastitanium hull components for later use
 2020-09-08 06:34:44 +01:00
Killian
bdaadc5726 general polish and prep 
includes some groundwork for the second phase of this PR
 2020-09-08 01:17:45 +01:00
Killian
5b4dc6069a all tests complete 2020-09-07 07:56:41 +01:00
Atermonera
87221b5e66 Adds hailer gas (face) masks. 2020-08-31 18:10:57 -04:00
Novacat
28c19ee066 Merge pull request #8868 from VOREStation/upstream-merge-7571 
[MIRROR] Colony Director -> Site Manager
 2020-08-28 13:17:58 -04:00
Novacat
bd4d0e78d4 Merge pull request #8833 from VOREStation/upstream-merge-7456 
[MIRROR] The great Aurora shoe heist
 2020-08-28 13:04:33 -04:00