cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
77,839 Commits 8 Branches 0 Tags
cf1db3c04924d2dd6fe7a9752e20e411870e1270
Commit Graph

867 Commits

Author SHA1 Message Date
Cadyn
cf1db3c049 Memory tracking shenanigans (#8359) 2024-05-15 16:56:31 +02:00
Raeschen
0ab7b1cdee Nuke remaining .proc/s (#7981) 
Co-authored-by: Selis <sirlionfur@hotmail.de>
 2024-03-16 17:04:00 +01:00
Guti
172e1c7c12 Balloon Alerts (#7877) 2024-03-15 07:40:14 +01:00
CHOMPStation2
faeac2717f [MIRROR] Fixes resonator cascade GC dependence, makes it work even under lag (#7897) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2024-03-06 09:07:00 +01:00
CHOMPStation2
e923714ae7 [MIRROR] Adds new mode for mining resonators: Resonance Cascade! (#7868) 
Co-authored-by: Runa Dacino <dacinoorder@gmail.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2024-03-02 13:25:19 +01:00
Cadyn
b90f7ec922 The 515 MegaPR early downport (#7783) 
Co-authored-by: Selis <selis@xynolabs.com>
Co-authored-by: Selis <sirlionfur@hotmail.de>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: SatinIsle <thesatinisle@gmail.com>
Co-authored-by: Heroman <alesha3000@list.ru>
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2024-02-27 20:17:32 +01:00
Drathek
3995338290 Moar whitespace normalization [MDB IGNORE] (#7750) 
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2024-02-16 10:54:47 +01:00
Aroliacue
213a952c4a Exploration Equipment Vendors and misc changes (#7616) 2024-01-28 18:25:39 -05:00
Aroliacue
40e6091f25 Bluespace Fultons, Surgical Bags in Cargo and misc changes (#7586) 2024-01-21 03:28:23 -05:00
BlackMajor
92c744dfec Event stuff, but also Squeak component (#7285) 2023-12-11 14:40:47 +13:00
Verkister
da219bad86 Adds more autotransfer filters, ore "recycling", and item digestability toggle. (#7102) 2023-10-26 12:45:57 -04:00
CHOMPStation2
d2e66e6410 [MIRROR] Refactors tool typechecks, refactors transforming tools, makes Altevian wrench into one (#7062) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Nadyr <41974248+Darlantanis@users.noreply.github.com>
 2023-10-04 18:37:41 -04:00
BlackMajor
7fd1ff3dc5 RCD Improvements + Holofans + fixes (#6738) 2023-08-06 17:07:59 +02:00
Razgriz
4aaf01a5bb Merge pull request #5714 from Cyrelius/Weapons/Armour 
Energy Weapons Balance Pass.
 2023-06-23 23:44:04 -07:00
Heroman3003
fd81098e66 Merge pull request #15067 from Runa-Dacino/miningfix 
Fixes mining explosives no longer spawning mhydrogen/platinum
 2023-06-22 21:17:10 +00:00
Heroman3003
db38ed93c0 Spell Fixes 2023-06-19 04:40:45 +00:00
Heroman3003
2281afdf24 More 515 Compatibility 2023-06-05 21:21:35 +00:00
Cyrelius
bcb623da6e Update survey_vendor.dm 
Reduced cost of Frontier Phaser weapons, making them more viable.
 2023-06-02 10:58:19 -07:00
Heroman3003
257b2e9a71 Merge pull request #14907 from KillianKirilenko/kk-fashion 
Martian Miner Coat & Hammer rarity
 2023-05-28 10:19:42 +00:00
Aroliacue
382eeec503 Adds shield generators to cargo and explo/mining vendors 2023-05-12 21:41:30 +10:00
Heroman3003
d10da6fb22 Merge pull request #14767 from KillianKirilenko/kk-shockmaul 
Concussion Maul
 2023-04-14 22:38:34 +00:00
Heroman3003
025fac4bf9 [MIRROR] /tg/ era language pass 2023-03-13 05:23:57 +00:00
Heroman3003
8fa41aa7b6 Merge pull request #14543 from Heroman3003/ore-pieces 
Allows ore processors to start collecting ore pieces again
 2023-02-25 03:02:59 +00:00
Novacat
10cc3d8829 Merge pull request #14373 from Cyantime/patch-3 
Fixes #14268
 2023-01-23 14:36:46 +00:00
Razgriz
0a20fcd5b7 Add frontier marksman rifle to vendor, increase frontier costs 
-Added the frontier marksman rifle to vendor
-Increased frontier phaser costs
 2023-01-20 18:15:29 -07:00
Casey
5ff3d93601 Merge pull request #14129 from Screemonster/whatsinthebox 
Makes lootboxes a hell of a lot more random
 2022-11-27 18:01:16 +00:00
Razgriz
edc64dcbdf Merge pull request #4143 from Tasald/Explorationedits 
Explorationedits
 2022-11-14 23:54:29 -07:00
Nadyr
f0e281b4f7 powder that makes you say yes 2022-11-07 17:32:52 -05:00
Casey
aa860598a2 remove xenoarch tools from mining vender 2022-11-06 17:13:44 +00:00
C.L
0853131f66 Merge pull request #13809 from Heroman3003/abandon-crate-fix 
Adjusts abandoned crate content self-destruct
 2022-09-25 22:42:28 +00:00
Nadyr
f847203a61 powder that makes you say yes 2022-09-25 17:29:00 -04:00
Nadyr
dd731c7474 powder that makes you say yes 2022-09-25 17:25:07 -04:00
Nadyr
a527ae97e4 powder that makes you say yes 2022-09-25 17:21:44 -04:00
Casey
1550c3bee5 Mining adjustments 2022-09-25 20:47:34 +00:00
Tasald
199ce43be6 renamed riot shield to riot shield 2022-09-22 22:50:46 -07:00
Casey
524cd2e671 Adds personal shield generators. [READY FOR MERGE] 2022-09-23 00:53:41 +00:00
Casey
ac204e7749 Replaces some old code w/ IsAdvancedToolUser and fixes twohanded weapons for simple_mobs 2022-07-29 20:48:29 +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
Casey
48f835f41f Fixes in-chat icons being broken in oldchat 2022-07-20 17:24:27 +00:00
Casey
65c56f646d Merge pull request #13348 from Heroman3003/abandoned-safe 
Makes abandoned crates destroy contents when tamper is detected
 2022-07-17 09:32:45 +00:00
Nadyr
a2d9c8b58a Merge branch 'master' into upstream-merge-13122 2022-06-22 22:37:44 -04:00
Casey
b0802ce267 More TGUI Input Conversions 2022-06-19 11:09:42 +00:00
Casey
928a321b5f TGUI Input Conversions 2022-06-19 03:59:14 +00:00
Casey
501bb21152 Plating can be built on most ground turfs. 2022-05-22 18:30:08 +00:00
Casey
be7e0a3c87 Merge pull request #12879 from Runa-Dacino/belt_dagger 
Adds belt slot flag to proto-kinetic machete and subtypes
 2022-05-08 09:42:24 +00:00
Tasald
1abc973117 edit and removal 
Increased the  price of the phasers and removed the new armor and denecrotizer from the vendor
 2022-05-01 11:47:26 -07:00
Tasald
6544a74295 Update code/modules/mining/ore_redemption_machine/survey_vendor.dm 
Co-authored-by: Rykka Stormheart <54187424+Rykka-Stormheart@users.noreply.github.com>
 2022-04-28 16:33:55 -07:00
Tasald
df53e85e90 Update survey_vendor.dm 2022-04-23 13:34:41 -07:00
Tasald
d740295aab Update survey_vendor.dm 2022-04-23 13:33:43 -07:00
Tasald
75f416d104 i am durp 
added exploration shield and added price to small pouches
 2022-04-23 13:32:43 -07:00