cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-25 16:54:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
63,615 Commits 9 Branches 0 Tags
d9fb7b0a42adfa3abb8badc020f2d5c403a3f4f1
Commit Graph

2205 Commits

Author SHA1 Message Date
Novacat
d9fb7b0a42 Merge pull request #10368 from VOREStation/upstream-merge-8083 
[MIRROR] Food 4 thought
 2021-05-21 20:00:24 +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
Nadyr
e157d0bf79 Merge pull request #1939 from CHOMPStationBot/upstream-merge-10257 
[MIRROR] Changes some Exploration Colors
 2021-05-11 23:56:27 -04:00
Chompstation Bot
d7f20396de Personal crafting & Dependencies 2021-05-11 22:43:33 -04:00
Novacat
2027165318 Merge pull request #10257 from Novacat/nova-ert 
Changes some Exploration Colors
 2021-05-11 13:07:03 +00:00
Nadyr
b5566ff403 Merge pull request #1914 from CHOMPStationBot/upstream-merge-10268 
[MIRROR] Adds a big batch of mobs to maint pred pool
 2021-05-09 07:47:25 -04:00
Nadyr
1f33d5696f Merge pull request #1900 from CHOMPStationBot/upstream-merge-10236 
[MIRROR] Toys expansion
 2021-05-08 23:50:05 -04:00
Chompstation Bot
78593f1c11 Adds a big batch of mobs to maint pred pool 2021-05-09 01:37:07 +00:00
Novacat
3245498530 Merge pull request #10236 from dwinters99/toys 
Toys expansion
 2021-05-06 14:42:49 +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
Darlantan
6806e7d9b5 Implanter, raccoons 2021-04-13 04:31:10 -04:00
Novacat
93b480e5fb Merge pull request #10149 from Novacat/nova-ert 
Replaces old pilot helmets
 2021-04-13 02:39:37 +00:00
Chompstation Bot
413bafbb91 Some minor mapfixes 2021-04-03 02:40:33 -04:00
Nadyr
4cbf330a93 Merge branch 'master' into upstream-merge-10055 2021-04-03 00:25:44 -04:00
Razgriz
e9cfca5370 Update misc_vr.dm 2021-03-31 02:18:45 -07:00
Chompstation Bot
088d05245d [MIRROR] Tesh gliding tweaks. 2021-03-31 09:14:30 +00:00
Nadyr
452671247c Update trash_pile_vr.dm 2021-03-30 02:54:11 -04:00
Razgriz
13a9e0c94a Update event_vr.dm 2021-03-24 23:05:42 -07:00
Razgriz
5e18aaed38 Event update 
Fixes Gravity event. Also adds landmarks to the map that enables the maints pred event.
 2021-03-24 23:03:24 -07:00
Chompstation Bot
07dcf04408 [MIRROR] Fixes Global and Fixes Eyes 2021-03-18 14:40:07 +00:00
Nadyr
c6d02615d7 Merge pull request #1574 from CHOMPStationBot/upstream-merge-9913 
[MIRROR] Adds a new maint pred mob
 2021-03-12 01:48:23 -05:00
Novacat
9645893750 Merge pull request #9913 from Heroman3003/sect-drone 
Adds a new maint pred mob
 2021-03-11 14:48:27 +00:00
Chompstation Bot
4c8dab8a21 [MIRROR] Adds an advanced version of the mining drill scanner. 2021-03-10 19:17:39 +00:00
Chompstation Bot
a459be5696 [MIRROR] Adds some new wheelchair types 2021-03-09 16:29:51 +00:00
Nadyr
5b0fbb29d5 Merge pull request #1520 from CHOMPStationBot/upstream-merge-9868 
[MIRROR] Gateway for Heads, Pilot to Civ
 2021-03-08 23:30:54 -05:00
Novacat
ebf0391948 Merge pull request #9865 from Heroman3003/sizespace-suit 
Adds HYPER suit
 2021-03-08 16:06:23 +00:00
Chompstation Bot
cacb1f019d Gateway for Heads, Pilot to Civ 2021-03-08 16:05:16 +00:00
Novacat
8be1af3b62 Merge pull request #9849 from Heroman3003/striptease-yeah-baby 
Makes dance poles (de)constructible
 2021-03-04 18:57:20 +00:00
Chompstation Bot
ad57e1ad13 [MIRROR] Sideports a couple of init unit tests from Neb. 2021-02-27 18:45:36 +00:00
Razgriz
4729aba17f Merge pull request #1340 from CHOMPStationBot/upstream-merge-9727 
[MIRROR] [MIRROR] Makes wrenches only anchor lockers if they're open
 2021-02-18 04:28:54 -07:00
Novacat
6b62269885 Merge pull request #9734 from MarinaGryphon/init_fixes 
Fixes init issues in _vr files.
 2021-02-16 17:59:00 +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
Nadyr
83861014e7 Merge pull request #1308 from CHOMPStationBot/upstream-merge-9691 
[MIRROR] [MIRROR] Allows custom-selection of posters
 2021-02-14 07:09:52 -05:00
Razgriz
ebe5c88699 Merge pull request #1273 from CHOMPStationBot/upstream-merge-9543 
[MIRROR] [MIRROR] Space cleaner cleans mobs
 2021-02-13 15:52:23 -07:00
Novacat
3f3e7c536f Merge pull request #9691 from VOREStation/upstream-merge-7865 
[MIRROR] Allows custom-selection of posters
 2021-02-12 21:27:50 +00:00
Razgriz
d600952be7 Merge pull request #1167 from CHOMPStationBot/upstream-merge-9517 
[MIRROR] [MIRROR] Directional Signs Update
 2021-02-11 22:23:56 -07:00
Verkister
3e2d6f6f76 Merge pull request #9543 from VOREStation/upstream-merge-7802 
[MIRROR] Space cleaner cleans mobs
 2021-02-09 18:18:03 +00:00
cadyn
373329e941 Merge pull request #1220 from CHOMPStationBot/upstream-merge-9623 
[MIRROR] Adds flushable toilets.
 2021-02-04 23:48:40 -08:00
Chompstation Bot
d3c7cc6040 New advanced Egg Release mechanics. 2021-02-01 19:35:41 +00:00
Verkister
9269ff74a0 Merge pull request #9623 from Verkister/thronetime 
Adds flushable toilets.
 2021-02-01 09:45:34 +00:00
Razgriz
710c6b5021 Merge pull request #1197 from CHOMPStationBot/upstream-merge-9615 
[MIRROR] Converts Morph Spawn and Maint Pred events to use ghostpods
 2021-01-30 00:20:38 -07: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
Chompstation Bot
be8d010ff9 Converts Morph Spawn and Maint Pred events to use ghostpods 2021-01-27 02:25:00 +00:00
Novacat
5211edc9c0 Merge pull request #9573 from VOREStation/upstream-merge-7786 
[MIRROR] Gadgets & Gizmos
 2021-01-24 06:55:05 +00:00
Novacat
76258d4316 Merge pull request #9517 from VOREStation/upstream-merge-7792 
[MIRROR] Directional Signs Update
 2021-01-24 06:46:41 +00:00
cadyn
58e59eaa6b Merge pull request #1149 from Sharkmare/master 
Adds Sharkpile prototype + 939
 2021-01-22 11:11:38 -08:00
Sharkmare
3e703733cb putting th eunique check in the correct spot woops 2021-01-21 08:28:03 +01:00