cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-31 09:09:49 +01:00
Code Issues Packages Projects Releases Wiki Activity
73,987 Commits 13 Branches 0 Tags
25ef364bd2c304149929374f9fc7fcb89c822909
Commit Graph
2533 Commits
Author SHA1 Message Date
NadyrandGitHub 25ef364bd2 Merge pull request #5960 from CHOMPStation2/upstream-merge-14701 
[MIRROR] Shuttle Bay signs
 2023-03-17 04:03:28 -04:00
NadyrandGitHub 506661f8f4 Merge pull request #5919 from CHOMPStation2/upstream-merge-14551 
[MIRROR] [MIRROR] /tg/ era language pass
 2023-03-17 02:40:16 -04:00
Heroman3003andCHOMPStation2 b333971955 Shuttle Bay signs 2023-03-17 01:06:16 +00:00
Heroman3003andCHOMPStation2 025fac4bf9 [MIRROR] /tg/ era language pass 2023-03-13 05:23:57 +00:00
TheGreatKitsune dc89ee8f88 Fixes crematoriums sometimes getting broken when opening 2023-03-11 22:34:53 -06:00
NadyrandGitHub 8f2312988b Merge pull request #5807 from CHOMPStation2/upstream-merge-14566 
[MIRROR] Makes SD wall lockers properly visible
 2023-02-27 02:17:07 -05:00
NadyrandGitHub 34208c191b Merge pull request #5785 from CHOMPStation2/upstream-merge-14547 
[MIRROR] Ghost pod for debris POI moved into its own separate PR
 2023-02-27 02:08:18 -05:00
CaseyandCHOMPStation2 594ec63a8b Makes SD wall lockers properly visible 2023-02-26 18:10:04 +00:00
RazgrizandGitHub cef0668717 Merge pull request #5793 from CHOMPStation2/upstream-merge-14554 
[MIRROR] [MIRROR] Safes Move Objects In Late Initialize.
 2023-02-26 01:02:42 -07:00
Heroman3003andCHOMPStation2 ab8361b3f3 Merge pull request #14554 from VOREStation/upstream-merge-8981 
[MIRROR] Safes Move Objects In Late Initialize.
 2023-02-26 00:52:29 +00:00
Heroman3003andCHOMPStation2 916526893a Merge pull request #14547 from Runa-Dacino/SurvivorPod 
Ghost pod for debris POI moved into its own separate PR
 2023-02-25 03:04:16 +00:00
Heroman3003andCHOMPStation2 993acbf556 Merge pull request #14534 from Heroman3003/art-paint-stuff 
Adjusts artistic crate orders
 2023-02-25 03:01:42 +00:00
CaseyandCHOMPStation2 b82736dc53 Merge pull request #14504 from Very-Soft/misc_fixes 
Misc fixes
 2023-02-17 19:32:51 +00:00
RazgrizandGitHub 92d9cc3724 Add ticket printer to warden locker 2023-02-15 16:29:04 -07:00
RazgrizandGitHub 492eb58400 Add ticket printer to HoS locker 2023-02-15 16:28:18 -07:00
RazgrizandGitHub fa3c94ace6 Add ticket printer to security locker 2023-02-15 16:27:09 -07:00
RazgrizandGitHub eb0909a6fb Update HoS lockers 2nd deck 2023-02-12 17:28:05 -07:00
Heroman3003andCHOMPStation2 450842aaec Merge pull request #14428 from VOREStation/upstream-merge-8915 
[MIRROR] allows soap and showers to clean toes, and space cleaner to actually clean synthetic toes
 2023-02-04 20:58:26 +00:00
NadyrandGitHub 708232d677 Merge pull request #5623 from CHOMPStation2/upstream-merge-14402 
[MIRROR] [MIRROR] Tiny grammar tweaks
 2023-02-02 20:50:59 -05:00
NovacatandCHOMPStation2 e34a990b3c Merge pull request #14411 from Cyantime/patch-2 
Fixes #14409
 2023-02-01 01:53:56 +00:00
Heroman3003andCHOMPStation2 077834dd5c [MIRROR] Tiny grammar tweaks 2023-01-30 08:51:26 +00:00
NadyrandGitHub 527fc4dacc Merge pull request #5595 from CHOMPStation2/upstream-merge-14368 
[MIRROR] Fixes boxing ropes (bottom) and boxing turnbuckle not blocking properly
 2023-01-27 10:30:21 -05:00
BlackMajorandGitHub 353f4e1cab Merge branch 'master' into upstream-merge-14247 2023-01-25 14:01:30 +13:00
RazgrizandGitHub 376b3e8906 powder that makes you say yes 2023-01-24 17:53:21 -07:00
CaseyandCHOMPStation2 e5a0753e45 Fixes boxing ropes (bottom) and boxing turnbuckle not blocking properly 2023-01-22 18:37:22 +00:00
RazgrizandGitHub 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
VerkisterandGitHub 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
NadyrandGitHub 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
NadyrandGitHub 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
NadyrandGitHub b7ef4171c8 Merge pull request #5475 from CHOMPStation2/upstream-merge-14262 
[MIRROR] Maint pred cancel tweak
 2023-01-04 20:34:36 -05:00
NadyrandGitHub 7429a71bcb powder that makes you say yes 2023-01-04 20:12:26 -05:00
NovacatandCHOMPStation2 b1c7a73918 Merge pull request #14301 from Heroman3003/borgfix2 
Fixes personal lockers robbing borgs of their modules
 2023-01-04 13:40:35 +00:00
Heroman3003andCHOMPStation2 e270d35320 Merge pull request #14264 from Heroman3003/chaircolors 
Fixes comfy chair colors
 2022-12-30 21:05:16 +00:00
Heroman3003andCHOMPStation2 21b9d0e636 Adjusts events and refactors borgs a bit in process 2022-12-30 21:05:11 +00:00
Heroman3003andCHOMPStation2 c3d2148faa Maint pred cancel tweak 2022-12-29 04:51:39 +00:00
NovacatandCHOMPStation2 f0b2c95957 Merge pull request #14256 from Heroman3003/borg-low-wall 
Two borg fixes
 2022-12-26 22:57:06 +00:00
CaseyandCHOMPStation2 754c0af3c3 Gives pilots their holdout back 2022-12-26 02:11:48 +00:00
CaseyandCHOMPStation2 764e792895 Remove the Exploration Department 2022-12-23 16:21:39 +00:00
Heroman3003andCHOMPStation2 c502bad450 Merge pull request #14202 from VOREStation/upstream-merge-8859 
[MIRROR] Greenjoe12345/xmas2022
 2022-12-14 06:36:11 +00:00
RazgrizandGitHub 034e6bd7b3 powder that rejects your reality and substitutes our own 2022-12-11 19:17:42 -07:00
Heroman3003andCHOMPStation2 2e7c58bfa8 Merge pull request #14096 from Novacat/nova-basicfixes 
Trash pile adjustments
 2022-11-21 04:34:16 +00:00
CaseyandCHOMPStation2 191657472b Merge pull request #14066 from Heroman3003/sofix 
Hopefully fixes corner sofas
 2022-11-13 20:47:59 +00:00
CaseyandCHOMPStation2 18e8135f8e Merge pull request #14033 from Heroman3003/axe-the-axe 
Axes the axes
 2022-11-06 17:12:35 +00:00
Heroman3003andCHOMPStation2 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
CaseyandCHOMPStation2 bd67968cb8 talon, vb, and typhon fixes 2022-10-16 21:02:45 +00:00
NadyrandGitHub 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
CaseyandCHOMPStation2 b1e9486aab [MIRROR] A -ton of Flags [READY FOR MERGE] 2022-10-10 03:06:09 +00:00
CaseyandCHOMPStation2 9665bac0b5 Merge pull request #13859 from Cameron653/FLYING 
ALL TERRAIN WINGS
 2022-10-10 03:03:42 +00:00
RazgrizandGitHub cd0e5fd00a Merge pull request #5068 from CHOMPStation2/upstream-merge-13828 
[MIRROR] Blueprint Revamp.
 2022-10-02 22:47:55 -07:00