cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-02-03 05:00:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
67,771 Commits 11 Branches 0 Tags
e8a55485a14ea567b89490a9d9d3f3a61ba97840
Commit Graph

19601 Commits

Author SHA1 Message Date
Nadyr
1a0f67fd36 Merge pull request #3569 from CHOMPStation2/upstream-merge-12068 
[MIRROR] Fixes mech jetpack allowing breaking time and space
 2022-01-16 23:14:43 -05:00
Nadyr
0f6632515f Merge pull request #3561 from CHOMPStation2/upstream-merge-12062 
[MIRROR] Fixes runtime spam caused by altclicking tiles
 2022-01-16 23:10:21 -05:00
Casey
9460986025 Merge pull request #12061 from Very-Soft/spoilers 
Removes the announcement for main pred and morph spawns
 2022-01-14 18:45:25 +00:00
Casey
3b4f3a85f6 Merge pull request #12068 from Heroman3003/mechafix 
Fixes mech jetpack allowing breaking time and space
 2022-01-14 18:45:17 +00:00
Novacat
3093c4c97b Merge pull request #12062 from Verkister/patch-107 
Fixes runtime spam caused by altclicking tiles
 2022-01-12 16:03:38 +00:00
Nadyr
d8fe29d97a Merge pull request #3533 from CHOMPStation2/upstream-merge-12029 
[MIRROR] more stuff fits on toolbelts of holding take 2 because i fucked up somewhere
 2022-01-09 20:45:32 -05:00
Nadyr
c5c1bf0b8a Merge pull request #3531 from CHOMPStation2/upstream-merge-12030 
[MIRROR] Adjusts descriptions and flavor texts of painting frames
 2022-01-09 20:20:12 -05:00
Nadyr
97e80df2a7 Merge branch 'master' into upstream-merge-12029 2022-01-09 20:18:25 -05:00
Casey
61a2292fc2 Merge pull request #12013 from Hatterhat/patch-5 
inducer on holding belt
 2022-01-09 01:52:31 +00:00
Casey
a84c109a45 more stuff fits on toolbelts of holding take 2 because i fucked up somewhere 2022-01-09 01:51:08 +00:00
Casey
e3e993aed6 Merge pull request #12030 from Heroman3003/artfix 
Adjusts descriptions and flavor texts of painting frames
 2022-01-09 01:50:51 +00:00
Verkister
20d51c7d61 Earlyports fix for inavtive vr pod traps 
Fixes inactive vr pods trapping the occupant due to a runtime error preventing the code from releasing the occupant.
 2022-01-08 17:15:24 +02:00
Verkister
5e4355a37b Adds soundproofing to dorms 
Been a thing on virgo for ages.
 2021-12-26 14:36:54 +02:00
Nadyr
d0b8c2b90c Merge pull request #3501 from InsanityKitten/tguiScarabfix 
Tgui scarab fix
 2021-12-20 20:36:23 -05:00
Nadyr
9a88c804a0 Merge pull request #3500 from Shadowfire117/master 
Merry Christmas
 2021-12-20 20:36:09 -05:00
InsanityKitten
338e7a8d39 Update mech_fabricator.dm 2021-12-20 20:11:33 -05:00
Shadow
79d8f74895 Merry Christmas! 
Many more enjoyable items to gain from the chomp christmas present, now with new pretty sprites
new casino specific headset for the hardworking casino crew to use
Fixed issue with teshari collar not appearing when wearing casino prize collar
made the SPASM disconnected variant of the casino slave collar function as holo so easier to set new tag
Fixed issue with non-visible casino crew ids
new spawner grenade that spawns a gorilla, and not the fur covered monkey kind!
Added a lot of new prizes to buy from the casino prize dispenser
Rebalanced money regained from converting chips back into thalers at the chips exchanger
 2021-12-21 00:31:15 +01:00
Nadyr
ec3d95f7ba Merge pull request #3487 from CHOMPStation2/upstream-merge-12005 
[MIRROR] Makes your balls better
 2021-12-12 06:44:42 -05:00
Nadyr
970000bbc4 Merge pull request #3486 from CHOMPStation2/upstream-merge-12004 
[MIRROR] Limits painting name length to 250 characters
 2021-12-12 06:44:23 -05:00
Nadyr
c9da082ac9 Merge pull request #3265 from CHOMPStation2/upstream-merge-11960 
[MIRROR] Another capture crystal tweak
 2021-12-12 06:31:54 -05:00
Nadyr
1141e96505 Merge pull request #3295 from CHOMPStation2/upstream-merge-11975 
[MIRROR] Door Interact Tweaks
 2021-12-12 06:28:53 -05:00
Nadyr
dfdf720ee9 Merge pull request #3301 from CHOMPStation2/upstream-merge-11968 
[MIRROR] Allows simplemobs climb ladders + trash pile interaction fix
 2021-12-12 06:22:42 -05:00
Nadyr
6c94ceeb20 Merge pull request #3347 from CHOMPStation2/upstream-merge-11967 
[MIRROR] Replaces wish granter with old 'dark' version; removes antag role from it
 2021-12-12 06:22:13 -05:00
Nadyr
80ee11925e Merge pull request #3302 from CHOMPStation2/upstream-merge-11965 
[MIRROR] Fixes guestpass icon
 2021-12-12 06:20:18 -05:00
Nadyr
56829b92c8 Merge branch 'master' into upstream-merge-11960 2021-12-12 06:19:17 -05:00
Nadyr
9f2ede544d Merge pull request #3267 from CHOMPStation2/upstream-merge-11955 
[MIRROR] Tweak capture crystal
 2021-12-12 06:08:46 -05:00
Nadyr
b796814d3c Merge pull request #3473 from CHOMPStation2/upstream-merge-11878 
[MIRROR] Fix for issue #5643
 2021-12-12 06:05:03 -05:00
Nadyr
001ca8885f Merge branch 'master' into upstream-merge-11848 2021-12-12 05:43:50 -05:00
Nadyr
b6e1741f11 Merge pull request #3447 from CHOMPStation2/upstream-merge-11842 
[MIRROR] SpaceVines - Now with 100% More Landmark Moments
 2021-12-12 05:39:43 -05:00
Nadyr
aab00937a3 Merge pull request #3443 from CHOMPStation2/upstream-merge-11838 
[MIRROR] Hide da shuttle fields
 2021-12-12 05:33:56 -05:00
Nadyr
bc8d0dd993 Merge pull request #3450 from CHOMPStation2/upstream-merge-11845 
[MIRROR] Blast doors now properly resist fire
 2021-12-12 05:33:11 -05:00
Nadyr
27dd839379 Merge branch 'master' into upstream-merge-11838 2021-12-12 05:25:27 -05:00
Nadyr
97270ba71c Merge pull request #3439 from CHOMPStation2/upstream-merge-11832 
[MIRROR] mechaport gaming
 2021-12-12 04:59:33 -05:00
Nadyr
ce9f9ba5a0 Merge pull request #3434 from CHOMPStation2/upstream-merge-11822 
[MIRROR] Fixes double counting of implants on scanner printout
 2021-12-12 04:47:14 -05:00
Nadyr
5c2cdb3d5e Merge pull request #3433 from CHOMPStation2/upstream-merge-11821 
[MIRROR] Adds Altevian Language & ATC Fluff
 2021-12-12 04:46:37 -05:00
Nadyr
bb0392740f powder that makes you say yes 2021-12-12 04:23:10 -05:00
Nadyr
89168e2c7d powder that makes you say yes 2021-12-12 04:22:41 -05:00
Casey
5cefa8d4e3 department berets (mostly heads tbh) 2021-12-12 04:20:38 -05:00
Nadyr
d12a0f1b42 Merge pull request #3492 from CHOMPStation2/upstream-merge-11752 
[MIRROR] Renames Engineer, new alt-titles for Stellar Delight
 2021-12-12 04:13:36 -05:00
Nadyr
bf5f98c728 Merge pull request #3427 from CHOMPStation2/upstream-merge-11815 
[MIRROR] Adds catslug to maintpred options
 2021-12-12 04:13:27 -05:00
Casey
9163ddb85b Renames Engineer, new alt-titles for Stellar Delight 2021-12-12 08:46:53 +00:00
Nadyr
2cef388d77 Merge pull request #3424 from CHOMPStation2/upstream-merge-11812 
[MIRROR] Fixes invisible Heat Exchange Pipes
 2021-12-12 03:38:28 -05:00
Nadyr
bbba20e9a3 Merge branch 'master' into upstream-merge-11802 2021-12-12 03:16:19 -05:00
Nadyr
d3c1d20387 Merge pull request #3413 from CHOMPStation2/upstream-merge-11797 
[MIRROR] Makes fuzzycuffs easier to get out of
 2021-12-12 02:34:31 -05:00
Nadyr
30b8d64c17 Merge pull request #3408 from CHOMPStation2/upstream-merge-11792 
[MIRROR] fixes body scanner not being synced with display/station time
 2021-12-12 02:27:20 -05:00
Nadyr
97748f9f81 Merge pull request #3395 from CHOMPStation2/upstream-merge-11777 
[MIRROR] i hate the engraving antichrist
 2021-12-12 02:19:10 -05:00
Nadyr
62921c7b1a Merge pull request #3401 from CHOMPStation2/upstream-merge-11779 
[MIRROR] Fixes infinite glass from low walls
 2021-12-12 02:00:08 -05:00
Nadyr
a91a503dc3 powder that makes you say yes 2021-12-12 01:34:46 -05:00
Nadyr
3c32302c67 powder that makes you say yes 2021-12-12 01:34:01 -05:00
Nadyr
e2171f3b29 powder that makes you say yes 2021-12-12 01:33:08 -05:00