cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-20 22:33:38 +00:00
Code Issues Packages Projects Releases Wiki Activity
72,866 Commits 8 Branches 0 Tags
33f82fd5acbc56d2f48a34fc8b78cfb1b07039eb
Commit Graph

2507 Commits

Author SHA1 Message Date
Razgriz
9197e1b95d Merge branch 'master' into upstream-merge-14220 2023-01-21 22:24:10 -07:00
Razgriz
418643dce3 unfucc exploration 
please do not the department
 2023-01-21 22:21:39 -07:00
Verkister
604af27af9 also fixes that damn replicant window runtime rarr 
that line 183 above represents the feel of this shit messing up test runs and shit
 2023-01-11 08:13:39 +02:00
Nadyr
d53b043ea7 Merge pull request #5508 from CHOMPStation2/upstream-merge-14301 
[MIRROR] Fixes personal lockers robbing borgs of their modules
 2023-01-04 21:17:36 -05:00
Nadyr
00edc849b5 Merge pull request #5479 from CHOMPStation2/upstream-merge-14269 
[MIRROR] Adjusts events and refactors borgs a bit in process
 2023-01-04 20:45:00 -05:00
Nadyr
b7ef4171c8 Merge pull request #5475 from CHOMPStation2/upstream-merge-14262 
[MIRROR] Maint pred cancel tweak
 2023-01-04 20:34:36 -05:00
Nadyr
7429a71bcb powder that makes you say yes 2023-01-04 20:12:26 -05:00
Novacat
b1c7a73918 Merge pull request #14301 from Heroman3003/borgfix2 
Fixes personal lockers robbing borgs of their modules
 2023-01-04 13:40:35 +00:00
Heroman3003
e270d35320 Merge pull request #14264 from Heroman3003/chaircolors 
Fixes comfy chair colors
 2022-12-30 21:05:16 +00:00
Heroman3003
21b9d0e636 Adjusts events and refactors borgs a bit in process 2022-12-30 21:05:11 +00:00
Heroman3003
c3d2148faa Maint pred cancel tweak 2022-12-29 04:51:39 +00:00
Novacat
f0b2c95957 Merge pull request #14256 from Heroman3003/borg-low-wall 
Two borg fixes
 2022-12-26 22:57:06 +00:00
Casey
764e792895 Remove the Exploration Department 2022-12-23 16:21:39 +00:00
Heroman3003
c502bad450 Merge pull request #14202 from VOREStation/upstream-merge-8859 
[MIRROR] Greenjoe12345/xmas2022
 2022-12-14 06:36:11 +00:00
Razgriz
034e6bd7b3 powder that rejects your reality and substitutes our own 2022-12-11 19:17:42 -07:00
Heroman3003
2e7c58bfa8 Merge pull request #14096 from Novacat/nova-basicfixes 
Trash pile adjustments
 2022-11-21 04:34:16 +00:00
Casey
191657472b Merge pull request #14066 from Heroman3003/sofix 
Hopefully fixes corner sofas
 2022-11-13 20:47:59 +00:00
Casey
18e8135f8e Merge pull request #14033 from Heroman3003/axe-the-axe 
Axes the axes
 2022-11-06 17:12:35 +00:00
Heroman3003
4a38648ead Merge pull request #13974 from TheDavestDave/cargo-update 
lets cargo order a pair of great tits
 2022-10-29 07:38:10 +00:00
Casey
bd67968cb8 talon, vb, and typhon fixes 2022-10-16 21:02:45 +00:00
Nadyr
7df5e6e4cb Merge pull request #5113 from CHOMPStation2/upstream-merge-13867 
[MIRROR] [MIRROR] A -ton of Flags [READY FOR MERGE]
 2022-10-11 20:43:55 -04:00
Casey
b1e9486aab [MIRROR] A -ton of Flags [READY FOR MERGE] 2022-10-10 03:06:09 +00:00
Casey
9665bac0b5 Merge pull request #13859 from Cameron653/FLYING 
ALL TERRAIN WINGS
 2022-10-10 03:03:42 +00:00
Razgriz
cd0e5fd00a Merge pull request #5068 from CHOMPStation2/upstream-merge-13828 
[MIRROR] Blueprint Revamp.
 2022-10-02 22:47:55 -07:00
Casey
892960d661 Blueprint Revamp. 2022-10-02 17:59:49 +00:00
Casey
f6708d3687 Adds in 'compliance implant' 2022-10-02 17:58:42 +00:00
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