cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-13 02:44:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
71,627 Commits 8 Branches 0 Tags
16cdb0dd2fe200464ce7b95b3ab1482dcfffd38f
Commit Graph

2481 Commits

Author SHA1 Message Date
C.L
dacb52516e Merge pull request #13804 from Heroman3003/empty-message-fix 
ADMIN: EVENT
 2022-09-25 20:48:53 +00:00
Razgriz
5c9dc4c7b5 Update signs.dm 2022-09-22 22:42:55 -07:00
Razgriz
e0139a383f Merge branch 'master' into master 2022-09-22 22:40:13 -07:00
Razgriz
f7d606d3db Merge pull request #5009 from CHOMPStation2/upstream-merge-13621 
[MIRROR] [MIRROR] Airlock assembly naming window starts with base_name (ABLE TO BE MERGED)
 2022-09-22 22:11:23 -07:00
Razgriz
e60b51327c Merge pull request #5015 from CHOMPStation2/upstream-merge-13010 
[MIRROR] [MIRROR] Fixes directional overlays on padded comfy and rounded chairs (ABLE TO BE MERGED)
 2022-09-22 21:59:18 -07:00
Razgriz
b93ed83208 powder that makes you say yes 2022-09-22 21:43:21 -07:00
VirgoBot
a3c824dcc8 [MIRROR] Fixes directional overlays on padded comfy and rounded chairs (ABLE TO BE MERGED) (#13010) 
* Fixes directional overlays on padded comfy and rounded chairs

* Fixes mirror conflicts (#13411)

* Update chairs.dm

* Update chairs.dm

Co-authored-by: Cerebulon <tanhindmarsh@yahoo.com>
Co-authored-by: Poojawa <Poojawa@users.noreply.github.com>
Co-authored-by: C.L <killer65311@gmail.com>
 2022-09-23 01:08:46 +00:00
VirgoBot
bfbbf3d48e [MIRROR] Adds job winter coats to job lockers (ABLE TO BE MERGED) (#12904) 
* Adds job winter coats to job lockers

* Update hooded.dm

* Update wardrobe.dm

* Update security.dm

* Update scientist.dm

* Update medical.dm

* Update cargo.dm

* Update job_closets.dm

* Update job_closets.dm

* Update hooded.dm

Co-authored-by: Spookerton <spkrtn@pm.me>
Co-authored-by: C.L <killer65311@gmail.com>
 2022-09-23 01:02:38 +00:00
Nadyr
87ccda6a4a Merge pull request #4861 from CHOMPStation2/upstream-merge-13669 
[MIRROR] Fixes a few more runtimes
 2022-09-07 16:06:55 -04:00
Casey
f874f1de0c Merge pull request #13669 from Heroman3003/runtimes2 
Fixes a few more runtimes
 2022-09-06 19:42:35 +00:00
Verkister
21417259ea Enables cargo otie crates 
Also adds a few more rng types for the said crates.
Unmarked earlyport for now i guess
 2022-09-06 16:30:44 +03:00
Novacat
52f9cb6350 Merge pull request #13474 from Heroman3003/washing-optimize 
Optimizes shower's turf washing a bit
 2022-08-11 00:08:31 +00:00
Casey
27753978fb Merge pull request #13397 from Fracshun/master 
Trash pile thing attempt 2
 2022-07-31 09:21:33 +00:00
Nadyr
c5a0f8fb24 Merge pull request #4584 from CHOMPStation2/upstream-merge-13371 
[MIRROR] Fixes in-chat icons being broken in oldchat
 2022-07-20 21:12:22 -04:00
Nadyr
d96777a733 Merge pull request #4583 from CHOMPStation2/upstream-merge-13372 
[MIRROR] makes brainzsnax obtainable ingame
 2022-07-20 21:09:50 -04:00
Nadyr
9d5dc5e62f Merge pull request #4566 from CHOMPStation2/upstream-merge-13346 
[MIRROR] Adds double engi closets for SD and RP
 2022-07-20 20:35:49 -04:00
Nadyr
094984f9be Merge branch 'master' into upstream-merge-13352 2022-07-20 20:16:05 -04:00
Casey
48f835f41f Fixes in-chat icons being broken in oldchat 2022-07-20 17:24:27 +00:00
Casey
95ad982fb2 Merge pull request #13372 from Screemonster/braaaaiiiins 
makes brainzsnax obtainable ingame
 2022-07-20 17:24:22 +00:00
Casey
fa9dd3dc1b Adds double engi closets for SD and RP 2022-07-17 09:31:34 +00:00
Casey
69eba2c403 Buffs Blockers and alters the new sound toggle verbs again 2022-07-17 05:05:32 +00:00
Casey
ec15ef3b8d Merge pull request #13343 from Heroman3003/deco-axe 
Adds 'fireaxes' to atmos/emt bay on SD/RP
 2022-07-16 21:39:09 +00:00
Casey
26dce1db7b Mouse Ray 2022-07-08 00:32:36 +00:00
Casey
7ac2d6537b Merge pull request #13249 from BonniePandora/petty-rage 
Changes the site manager's sidearm from a singular option to a choice instead
 2022-07-03 09:07:00 +00:00
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