cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-05 15:04:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
69,506 Commits 9 Branches 0 Tags
d7c6d66332694e3f8e51a13a3473ffa567ae7480
Commit Graph

19919 Commits

Author SHA1 Message Date
Novacat
4b4ba32e03 Merge pull request #12968 from Heroman3003/RUNTIME-FIX-END-ME 
Fixes runtimes being broken. Removes back-worn watertanks. NO I DO NO…
 2022-05-14 13:05:43 +00:00
Casey
9f6a9a4e6a Merge pull request #12897 from FartMaster69420/cocoon 
Cocoon Metamorphosis
 2022-05-12 19:21:53 +00:00
Razgriz
c3fdc6d677 Merge pull request #4227 from CHOMPStation2/upstream-merge-12934 
[MIRROR] Chest -> Torso Targeting Fixes
 2022-05-11 10:04:45 -07:00
Novacat
0eaa4a68ea Merge pull request #12943 from ItsSelis/selis-patch-pai 
Allow numbers in pAI name
 2022-05-10 14:53:07 +00:00
Novacat
24aa127d67 Chest -> Torso Targeting Fixes 2022-05-09 01:08:04 +00:00
Nadyr
0ccf97a237 Merge pull request #4221 from CHOMPStation2/upstream-merge-12925 
[MIRROR] Adds chemistry kits
 2022-05-08 14:42:45 -04:00
Nadyr
de3c078fad Merge pull request #4199 from CHOMPStation2/upstream-merge-12898 
[MIRROR] Communicator Ringtones
 2022-05-08 14:42:29 -04:00
Nadyr
d31e26dcba Merge pull request #4220 from CHOMPStation2/upstream-merge-12923 
[MIRROR] Shuttle fixes
 2022-05-08 11:18:07 -04:00
Nadyr
76627b4664 Merge pull request #4213 from CHOMPStation2/upstream-merge-12896 
[MIRROR] Fixes some issues with DNA code
 2022-05-08 11:11:32 -04:00
Nadyr
6c87352aa5 Merge pull request #4211 from CHOMPStation2/upstream-merge-12888 
[MIRROR] The pAI, Bot, and Microwave Tweaks
 2022-05-08 11:10:07 -04:00
Nadyr
d4ef291152 Merge pull request #4209 from CHOMPStation2/upstream-merge-12881 
[MIRROR] Pocket pouch rebalance + obtaining method
 2022-05-08 11:08:37 -04:00
Casey
16b58a8b18 Adds chemistry kits 2022-05-08 09:57:10 +00:00
Casey
d22210bc80 Shuttle fixes 2022-05-08 09:56:01 +00:00
Casey
169147e55a Merge pull request #12896 from FartMaster69420/dna-patch 
Fixes some issues with DNA code
 2022-05-08 09:49:09 +00:00
Casey
fbd967128d Merge pull request #12888 from FartMaster69420/pai_and_bots 
The pAI, Bot, and Microwave Tweaks
 2022-05-08 09:46:55 +00:00
Casey
ff911924b5 Merge pull request #12881 from TankTheBirb/master 
Pocket pouch rebalance + obtaining method
 2022-05-08 09:44:33 +00:00
Novacat
4df1e6ba74 Merge pull request #12903 from ItsSelis/selis-guestpass-patch 
Guestpass Patch
 2022-05-06 16:45:50 +00:00
Novacat
5bffcf5062 Communicator Ringtones 2022-05-05 00:44:55 +00:00
Nadyr
19da7df9b5 Merge pull request #4192 from CHOMPStation2/upstream-merge-12861 
[MIRROR] Fixing Stack Deletion
 2022-05-01 18:17:18 -04:00
Nadyr
978e9cb5a5 Merge pull request #4184 from CHOMPStation2/upstream-merge-12856 
[MIRROR] Quick GB tweaks
 2022-05-01 18:05:02 -04:00
Nadyr
6373935f07 Merge pull request #4166 from CHOMPStation2/upstream-merge-12837 
[MIRROR] Stonks!
 2022-05-01 18:04:49 -04:00
Nadyr
13d3cdc2ba Merge pull request #4167 from CHOMPStation2/upstream-merge-12842 
[MIRROR] Adds PoI loader landmarks
 2022-05-01 17:53:38 -04:00
Nadyr
fc07eb3487 Merge pull request #4163 from CHOMPStation2/upstream-merge-12829 
[MIRROR] Salvage+
 2022-05-01 17:42:19 -04:00
Nadyr
672c5ed903 Merge branch 'master' into upstream-merge-12842 2022-05-01 17:34:09 -04:00
Nadyr
4368f09a42 Merge pull request #4159 from CHOMPStation2/upstream-merge-12583 
[MIRROR] [MIRROR] Fixes catwalks making footsteps on everything
 2022-05-01 17:14:50 -04:00
Casey
5591cddadd Merge pull request #12861 from FartMaster69420/stack-patch 
Fixing Stack Deletion
 2022-05-01 03:10:03 +00:00
Razgriz
4ac931f832 Merge pull request #4157 from CHOMPStation2/upstream-merge-12568 
[MIRROR] Fixes the Xenochimera Details not being their own line
 2022-04-29 15:40:43 -07:00
Razgriz
f49e053631 Merge pull request #4154 from CHOMPStation2/upstream-merge-12838 
[MIRROR] Wild!
 2022-04-28 13:53:08 -07:00
Casey
7245e3880d Quick GB tweaks 2022-04-28 06:22:23 +00:00
Razgriz
bd78886a13 Merge pull request #4164 from CHOMPStation2/upstream-merge-12816 
[MIRROR] [MIRROR] Fixes ALL random tech components having a chance of being anomalous
 2022-04-27 02:34:32 -07:00
Razgriz
ece91d55fd Merge pull request #4162 from CHOMPStation2/upstream-merge-12802 
[MIRROR] [MIRROR] HE pipe turf interaction
 2022-04-27 02:33:49 -07:00
Razgriz
6aff76ff02 powder that makes you say yes 2022-04-27 02:31:59 -07:00
Razgriz
c92ad71b51 powder that makes you say yes 2022-04-27 02:30:22 -07:00
Razgriz
37480fabd2 Merge pull request #4074 from KeRSedChaplain/postthisratvar 
attempting to re-ignite my desire to code by adding a funny poster
 2022-04-27 02:24:59 -07:00
BlackMajor
720dbbe62c Merge branch 'master' into protean-rework 2022-04-27 20:45:38 +12:00
Casey
35df5c5164 Adds PoI loader landmarks 2022-04-26 21:24:23 +00:00
Casey
d4c6ba9bb7 Stonks! 2022-04-26 21:23:17 +00:00
Casey
759e1095ad Merge pull request #12816 from VOREStation/upstream-merge-8570 
[MIRROR] Fixes ALL random tech components having a chance of being anomalous
 2022-04-26 21:15:55 +00:00
Casey
411e608e4f Salvage+ 2022-04-26 21:15:51 +00:00
Casey
9912b51873 Merge pull request #12802 from VOREStation/upstream-merge-8409 
[MIRROR] HE pipe turf interaction
 2022-04-26 21:13:43 +00:00
Casey
586a366e24 [MIRROR] Fixes catwalks making footsteps on everything 2022-04-26 20:48:48 +00:00
Casey
a9fd377e0c Fixes the Xenochimera Details not being their own line 2022-04-26 20:46:33 +00:00
Casey
d6e576123c Wild! 2022-04-26 09:19:54 +00:00
BlackMajor
aeea4dfc9a Merge branch 'master' into protean-rework 2022-04-25 13:21:53 +12:00
Casey
fd5a1d7ce2 Merge pull request #12820 from Heroman3003/slow_sizegun 
Adds gradual sizegun
 2022-04-24 07:16:37 +00:00
Casey
c2f7c28dbb GBWilds 2022-04-24 00:33:52 +00:00
Dan-Neposh
03b0f32d8e forgot the comment message :pain: 2022-04-23 05:17:22 -04:00
Dan-Neposh
608dcaa80e puts the poster into _ch files 2022-04-23 05:15:16 -04:00
Tasald
9962272e51 Exploration upgread (#4137) 
* Add pathfinder to drop pouches

adds pathfinder to drop pouches so they can have them to.

* Revert "Add pathfinder to drop pouches"

* Revert "Revert "Add pathfinder to drop pouches""

* Exploration gear update

Adds missing standard items to exploration lockers so they arn't gimped.

* Update misc.dm

* PF locker update

Adds the plate carrier and exploration bags to pathfinder locker

* PF bags

Lets the pathfinder spawn with exploration bags instead of generic ones

* Binocs

Adds binocs to the list of items that can be stored in the belt

* Ecig addition

Adds the standard and alternative ecigs to the base load out. dun know if setting the price of the alt one two 2 is good or not.

* removes sharp things

takes out the duplicate knife and machete

* removes macete holster

* Update outfit_vr.dm

* Update misc.dm

* Update belt_vr.dm

* Update misc_vr.dm

* Update misc_vr.dm

* Update loadout_accessories.dm

* Update loadout_smoking.dm

* Update misc.dm
 2022-04-21 23:45:03 -07:00
BlackMajor
15ec60f86f Integration Tests, my beloved 2022-04-21 01:54:56 +12:00