cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 19:52:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
70,047 Commits 5 Branches 0 Tags
ecf834c452ae2bf93b51e1ad9e42a69448308e0c
Commit Graph

2456 Commits

Author SHA1 Message Date
Nadyr
a2d9c8b58a Merge branch 'master' into upstream-merge-13122 2022-06-22 22:37:44 -04:00
Nadyr
46ff42c250 Merge pull request #4371 from CHOMPStation2/upstream-merge-13103 
[MIRROR] [MIRROR-FIX] Cooking QOL V2
 2022-06-22 21:55:19 -04:00
Nadyr
03c4812145 Merge pull request #4368 from CHOMPStation2/upstream-merge-13094 
[MIRROR] Various Fixes
 2022-06-22 21:06:40 -04:00
Casey
b0802ce267 More TGUI Input Conversions 2022-06-19 11:09:42 +00:00
Novacat
47c92f2581 [MIRROR-FIX] Cooking QOL V2 2022-06-18 14:45:56 +00:00
Casey
c1187d1942 Various Fixes 2022-06-18 00:02:11 +00:00
TheGreatKitsune
21ab8401e8 Add CHOMPEdit 2022-06-16 12:51:45 -05:00
TheGreatKitsune
5c32caa31c Girders now render above catwalks. 
And probably also a few other things like dirt/blood. But girders now render the same way that Grilles do as far as layers/planes are concerned.
 2022-06-12 22:42:45 -05:00
Casey
f1122fd4b5 Duke's Mapping Competition: Burrito's Lake Map 2022-05-29 17:50:34 +00:00
Nadyr
96b9b449fc powder that makes you say yes 2022-05-27 15:54:25 -04:00
Casey
4aa0977f19 A couple more engineering QoL changes. 2022-05-22 18:24:54 +00:00
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
16b58a8b18 Adds chemistry kits 2022-05-08 09:57:10 +00:00
Nadyr
fc07eb3487 Merge pull request #4163 from CHOMPStation2/upstream-merge-12829 
[MIRROR] Salvage+
 2022-05-01 17:42:19 -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
Razgriz
6aff76ff02 powder that makes you say yes 2022-04-27 02:31:59 -07:00
BlackMajor
720dbbe62c Merge branch 'master' into protean-rework 2022-04-27 20:45:38 +12:00
Casey
411e608e4f Salvage+ 2022-04-26 21:15:51 +00:00
Casey
586a366e24 [MIRROR] Fixes catwalks making footsteps on everything 2022-04-26 20:48:48 +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
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
Casey
b9f0c0ef92 Late Night Stuff 2022-04-17 09:21:02 +00:00
Razgriz
d96f69c28d Fix maint pred cancellation 
The cancel button and corner X would just randomize the fucker. I fixed it. Now it actually cancels and resets itself. I will eat your face.
 2022-04-13 23:40:01 -07:00
Casey
0a447ad26f Merge pull request #12698 from FartMaster69420/xenobio-upgrades-clean 
Xenobio Upgrades
 2022-04-11 19:24:32 +00:00
Casey
97eccd40fa Merge pull request #12659 from Very-Soft/tweaks 
Adjusts trees and vendor spawners
 2022-04-06 00:56:29 +00:00
Nadyr
a121954e24 Merge pull request #3992 from CHOMPStation2/upstream-merge-12592 
[MIRROR] The Grand /TG Port - Part 6
 2022-04-04 17:52:53 -04:00
Nadyr
6fe5e8c1e1 Merge pull request #3991 from CHOMPStation2/upstream-merge-12579 
[MIRROR] The Grand /TG Port - Part 5
 2022-04-04 17:37:57 -04:00
Nadyr
d34ba3d49f Merge pull request #3990 from CHOMPStation2/upstream-merge-12578 
[MIRROR] The Grand /TG Port - Part 4
 2022-04-04 17:36:23 -04:00
Nadyr
1d62127841 Merge pull request #3989 from CHOMPStation2/upstream-merge-12577 
[MIRROR] The Grand /TG Port - Part 3
 2022-04-04 17:32:51 -04:00
Casey
de0be34c99 The Grand /TG Port - Part 6 2022-04-03 03:32:03 +00:00
Casey
60b1eeff99 Merge pull request #12579 from GhostActual/tg-port-5 
The Grand /TG Port - Part 5
 2022-04-03 03:30:56 +00:00
Casey
5c33d6ea19 Merge pull request #12578 from GhostActual/tg-port-4 
The Grand /TG Port - Part 4
 2022-04-03 03:29:50 +00:00
Casey
3ea4c8b9ea Merge pull request #12577 from GhostActual/tg-port-3 
The Grand /TG Port - Part 3
 2022-04-03 03:28:43 +00:00
Casey
d552e834a1 The Grand /TG Port - Part 2 2022-04-03 03:27:36 +00:00
Razgriz
390bca0ec1 powder that makes you say yes 2022-03-27 00:18:25 -07:00
Casey
51bd77e5c2 Firearms 1 2022-03-26 03:56:42 +00:00
Verkister
b5b4678908 Earlyports catwalk noise fix 
Fixes catwalks making footstep sounds on literally anything that crosses them, including ghosts and projectiles and everything else that definitely shouldn't be making footsteps.
 2022-03-24 21:17:58 +02:00
Nadyr
6cecc1762a powder that makes you say yes 2022-03-20 18:52:03 -04:00
Casey
8e0552a788 Colts, Revolvers, and Tasers 2022-03-20 03:10:23 +00:00
Razgriz
9b51a9f978 Merge pull request #3690 from harry3124/Yuliy-Gateway-Snowfield_1 
Re-opening Gateway/Snowfield Update
 2022-03-18 18:45:20 -07:00
Casey
de6e5c4932 Merge pull request #12382 from BonniePandora/Atmosia-Improvements 
Minor Atmos-tech QoL & new hazard vest
 2022-03-07 08:36:25 +00:00
Casey
80f5298a18 Ammo Boxes 2022-03-03 21:23:43 +00:00
Casey
68c0ed10a7 Merge pull request #12356 from Very-Soft/persistchange 
Change painting persist decay
 2022-03-02 06:08:02 +00:00
Casey
0eaeb0f368 THERE WILL BE BLOOD. SHED. 2022-02-26 09:12:15 +00:00
Nadyr
59090266bd Merge pull request #3717 from CHOMPStation2/upstream-merge-12286 
[MIRROR] Merge Fixes for 8222
 2022-02-19 20:51:16 -05:00
Nadyr
23f9e5828b Merge pull request #3701 from CHOMPStation2/upstream-merge-12247 
[MIRROR] Fixes sofa paths
 2022-02-19 20:34:07 -05:00
Nadyr
3fe87a33ed Merge pull request #3711 from CHOMPStation2/upstream-merge-12253 
[MIRROR] Donk Co. Toys
 2022-02-19 19:55:19 -05:00
Nadyr
97cf4ce634 Merge pull request #3681 from CHOMPStation2/upstream-merge-12233 
[MIRROR] Heavy-duty Engineer's Gloves
 2022-02-19 18:15:45 -05:00