cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-27 09:42:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
75,015 Commits 8 Branches 0 Tags
2a6d65a6d4e571da27bf883201ea470692d58cb5
Commit Graph

103 Commits

Author SHA1 Message Date
Nadyr
812e3b85ab Merge pull request #6300 from CHOMPStation2/upstream-merge-14943 
[MIRROR] Modifies scug picnic to use picnic blanket, makes it more aesthetically pleasing
 2023-06-09 21:47:14 -04:00
Heroman3003
000a9e3989 Merge pull request #14943 from Runa-Dacino/scugpicnic_p2 
Modifies scug picnic to use picnic blanket, makes it more aesthetically pleasing
 2023-06-03 09:20:57 +00:00
Heroman3003
d41519dcb8 Items for the Plant People (not the literal plant people) 2023-06-02 01:22:32 +00:00
Heroman3003
a4072d405e More space creature events 2023-04-02 20:23:37 +00:00
Casey
1138ab35fe Speed and stuff 2023-03-21 21:50:18 +00:00
Casey
4273cca010 Merge pull request #14591 from Runa-Dacino/scugpicnic 
Adds new POI to RP, creates scug spawner object
 2023-03-08 19:07:40 +00:00
Heroman3003
24e829b6a4 Adds new machine that mass-produces autoinjectors, maps it in 2023-02-18 19:09:36 +00:00
Casey
6600f25231 Merge pull request #14395 from Heroman3003/wl-fixes 
Adjustments to wildlife event
 2023-01-29 21:28:51 +00:00
Nadyr
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
Razgriz
6e4c340437 Merge branch 'master' into upstream-merge-14234 2023-01-24 17:23:08 -07:00
Casey
e5a0753e45 Fixes boxing ropes (bottom) and boxing turnbuckle not blocking properly 2023-01-22 18:37:22 +00:00
Razgriz
9197e1b95d Merge branch 'master' into upstream-merge-14220 2023-01-21 22:24:10 -07:00
Casey
8658910087 fixes RP seasonal subtypes and adds seasonal water 2023-01-08 20:37:51 +00:00
Nadyr
6a537e3c0f Merge branch 'master' into upstream-merge-14294 2023-01-04 21:46:39 -05:00
Nadyr
265cf3c967 Merge branch 'master' into upstream-merge-14294 2023-01-04 21:09:02 -05:00
Casey
94a2f6fd88 Brings Seasons to RP! 2023-01-04 21:08:44 -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
Casey
63c49c4e90 Replaces RP's carp, drone and jellyfish events with new Roaming Wildlife event 2023-01-03 21:56:23 +00:00
Heroman3003
c26d10f224 Merge pull request #14271 from Novacat/nova-basicfixes 
Miscallaneous Tweaks
 2022-12-30 21:06:28 +00:00
Heroman3003
21b9d0e636 Adjusts events and refactors borgs a bit in process 2022-12-30 21:05:11 +00:00
Casey
04f41aadb7 Adds fireworks and their launchers 2022-12-26 02:05:31 +00:00
Casey
695e39e30c Fixes some Oversights 2022-12-24 08:36:14 +00:00
Casey
764e792895 Remove the Exploration Department 2022-12-23 16:21:39 +00:00
Casey
6fbdc3141e Buffs library book management 2022-11-26 22:42:55 +00:00
Casey
b461e2fd06 Ticket Printer! 2022-11-21 06:42:48 +00:00
Casey
18e8135f8e Merge pull request #14033 from Heroman3003/axe-the-axe 
Axes the axes
 2022-11-06 17:12:35 +00:00
Casey
868e25d499 Adds pakkuns 2022-09-18 09:39:27 +00:00
Casey
95809d9ff7 Fixes edges of 3c wilds having wrong atmos in mineral walls 2022-09-03 16:35:53 +00:00
Casey
4d7e22c2e1 Adjustments to Mouse holse, micro hiding, and smole buildings! WOW! 2022-08-30 09:07:18 +00:00
Casey
85cf31f79c Merge pull request #13570 from Heroman3003/altevian-foods 
Adds Altevian cuisine
 2022-08-25 23:00:13 +00:00
Casey
734d22329e Nerfs mining yields for SD and RP 2022-08-14 05:44:47 +00:00
Novacat
850c931212 Merge pull request #13379 from FirstSgtDan/rascals-pass-mapping 
CE stamp in Rascal's Pass
 2022-07-23 22:44:33 +00:00
Nadyr
b862768bd8 Merge pull request #4585 from CHOMPStation2/upstream-merge-13370 
[MIRROR] Pilot NIFsoft Uploaders
 2022-07-20 21:12:36 -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
3dc5633fbf Merge pull request #4565 from CHOMPStation2/upstream-merge-13353 
[MIRROR] Back to GB!
 2022-07-20 20:35:11 -04:00
Nadyr
4d358339ae Merge pull request #4562 from CHOMPStation2/upstream-merge-13343 
[MIRROR] Adds 'fireaxes' to atmos/emt bay on SD/RP
 2022-07-20 20:12:49 -04:00
Casey
a42e3e59e4 Pilot NIFsoft Uploaders 2022-07-20 17:24:31 +00:00
Casey
fa9dd3dc1b Adds double engi closets for SD and RP 2022-07-17 09:31:34 +00:00
Casey
28642c7888 Back to GB! 2022-07-17 09:30:27 +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
95158e98ce Merge pull request #13332 from Heroman3003/teslamove 
Separates Forbids Events from Forbids Singulo
 2022-07-15 22:33:32 +00:00
Casey
26dce1db7b Mouse Ray 2022-07-08 00:32:36 +00:00
Razgriz
9182699a95 Merge pull request #4496 from CHOMPStation2/upstream-merge-13264 
[MIRROR] Fairy lights
 2022-07-03 17:19:23 -07:00
Razgriz
27bed6853c Merge pull request #4459 from CHOMPStation2/upstream-merge-13220 
[MIRROR] Makes all things that check for dorms check for forbid events var
 2022-07-03 17:15:03 -07:00
Razgriz
e3f4e04601 Merge pull request #4483 from CHOMPStation2/upstream-merge-13242 
[MIRROR] Enables Multi-Z Testing (Map & Wires)
 2022-07-03 17:14:35 -07:00
Razgriz
421af10807 powder that makes you say yes 2022-07-03 16:50:48 -07:00
Casey
386bb64824 Merge pull request #13264 from Very-Soft/fairylights 
Fairy lights
 2022-07-03 20:00:24 +00:00
Casey
0bbc161244 Enables Multi-Z Testing (Map & Wires) 2022-07-03 09:07:08 +00:00
Novacat
aa42677902 Merge pull request #13231 from Heroman3003/westwilds-2-fix 
Moves scrubber on westwilds2 version of sci outpost
 2022-07-01 21:26:29 +00:00
Casey
84e6bfd922 Makes all things that check for dorms check for forbid events var 2022-06-30 22:59:57 +00:00