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
78,443 Commits 8 Branches 0 Tags
c3578b965869aa55b29fa8d10b7e35315b56375f
Commit Graph

91 Commits

Author SHA1 Message Date
CHOMPStation2
24658f4b9d [MIRROR] August 2024 various fixes (#8766) 
Co-authored-by: Nadyr <41974248+Darlantanis@users.noreply.github.com>
 2024-08-14 02:15:42 +02:00
Guti
172e1c7c12 Balloon Alerts (#7877) 2024-03-15 07:40:14 +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
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
Novacat
10cc3d8829 Merge pull request #14373 from Cyantime/patch-3 
Fixes #14268
 2023-01-23 14:36:46 +00:00
Casey
1550c3bee5 Mining adjustments 2022-09-25 20:47:34 +00:00
Casey
48f835f41f Fixes in-chat icons being broken in oldchat 2022-07-20 17:24:27 +00:00
Casey
b0802ce267 More TGUI Input Conversions 2022-06-19 11:09:42 +00:00
Casey
84b984a731 Merge pull request #12145 from Hatterhat/t3drill 
makes a single t3 brace actually support its drill
 2022-02-06 14:12:43 +00:00
Casey
175bc573fe A Miner Update [forgot to test a thing] 2021-12-10 00:50:47 +00:00
Casey
776f39486a Merge pull request #11708 from Hatterhat/drill-buffs 
wacky haphazardly barely thought through standing drill buffs
 2021-10-27 16:10:30 +00:00
Aronai Sieyes
66669af98d Merge pull request #11170 from Heroman3003/thepurge 
Finishes purge of Industrial Expansion
 2021-07-20 14:46:30 +00:00
Chompstation Bot
481c0e314e Convert some bools to TRUE/FALSE instead of 1/0. 2021-07-16 17:44:40 +00:00
Nadyr
eafe24872c Merge pull request #2468 from CHOMPStationBot/upstream-merge-10972 
[MIRROR] Fixes #10941
 2021-07-10 01:14:01 -04:00
Aronai Sieyes
2e31d368e7 Merge pull request #10972 from VOREStation/Fixes/10941 
Fixes #10941
 2021-07-08 05:04:49 +00:00
Chompstation Bot
287a5deee3 Use material defines more 2021-07-07 19:02:05 +00:00
Chompstation Bot
14129d60cf Converts visible_message notice spans to look more like emotes 2021-07-05 20:30:12 +00:00
Chompstation Bot
b6e1989a01 The One Where I Port Modals 2021-06-30 19:29:34 +00:00
Novacat
f4b442e67d Merge pull request #10397 from VOREStation/upstream-merge-8074 
[MIRROR] Removes tin for ore generation
 2021-05-23 22:28:02 +00:00
Nadyr
33761e0558 Update drill.dm 2021-05-01 22:55:52 -04:00
Nadyr
62e293b890 Merge pull request #1557 from CHOMPStationBot/upstream-merge-9894 
[MIRROR] [MIRROR] Adds an advanced version of the mining drill scanner.
 2021-03-12 00:05:38 -05:00
Novacat
24a9d22855 Merge pull request #9898 from VOREStation/upstream-merge-7964 
[MIRROR] Taking cell out of a standing drill now attempts to put it in your hands.
 2021-03-10 19:30:10 +00:00
Chompstation Bot
4c8dab8a21 [MIRROR] Adds an advanced version of the mining drill scanner. 2021-03-10 19:17:39 +00:00
Nadyr
9d19cb12e0 Merge pull request #1547 from CHOMPStationBot/upstream-merge-9870 
[MIRROR] [MIRROR] The Deep Scan Device
 2021-03-10 01:45:55 -05:00
Novacat
9478017c49 Merge pull request #9870 from VOREStation/upstream-merge-7937 
[MIRROR] The Deep Scan Device
 2021-03-10 00:02:58 +00:00
Chompstation Bot
b85e9fc4d9 [MIRROR] Industrial Expansion 2021-03-09 21:53:03 +00:00
Cadyn
07775449d7 Fixing conflicts 2020-10-05 18:10:53 -07:00
Atermonera
ca2ce6adea Merge pull request #7600 from lbnesquik/Kot-Scanner-ore 
Reduce the ore scanner time from 10 to 2 seconds. Same as the mech one.
 2020-08-31 23:54:19 -04:00
SplinterGP
9b4843da61 i think this is all the changes ? 2020-07-27 20:59:20 -03:00
Novacat
b611dcfac7 Update drill.dm 2020-06-28 12:38:46 -04:00
Aronai Sieyes
0625e2d6b1 Adds get_cell to drill heads so you can use an inducer on them 2020-06-28 03:33:48 -04:00
Atermonera
69c3c8c98f mining drill and recharger find their shiny new cells 2020-06-13 06:57:09 -04:00
Atermonera
28e952806c Adds proc to replace default cells with high cap on machinery (#7241) 
* Adds proc to replace default cells with high cap on machinery

* *grumbling*
 2020-06-04 22:38:39 -04:00
Aronai Sieyes
21a640ebd3 Adds get_cell to drill heads so you can use an inducer on them 2020-06-02 20:56:55 -04:00
Aronai Sieyes
448a210929 Actually fix drill cells for real this time 2020-05-22 09:57:46 -04:00
Aronai Sieyes
264a8340c1 Can map in cell'd mining drills using the /loaded subtype 2020-05-21 11:31:00 -04:00
Aronai Sieyes
09074eaabb Alter playsound paradigm 2020-05-18 23:42:15 -04:00
Atermonera
9c32a0e2b3 Updates machines to use default_apply_parts() 2020-05-07 00:40:34 -04:00
Atermonera
f4e155db8f Merge pull request #7051 from InterroLouis/master 
Tweak to mining scanner
 2020-04-30 23:17:19 -04:00
Atermonera
cbb40196fc Machinery: Always use update_use_power() 2020-03-23 23:21:10 -04:00
Aronai Sieyes
f71bfa7100 Ore Scanner is written incorrectly 
Only revealed by vchat
 2020-03-01 17:22:31 -05:00
Arokha Sieyes
1d9e5be122 Replace \image macro with bicon() 2020-02-19 19:55:01 -05:00
Arokha Sieyes
47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
Atermonera
9325f590ca Mining Expansion, the Diggening. 2019-07-13 03:48:38 -04:00
Atermonera
4cde759fac Merge pull request #6175 from Heroman3003/braceself 
Fixed mining drill brace deconstruction issue
 2019-05-28 13:11:27 -04:00
Neerti
fc7c6f38b4 Base features for Precursotech and Anomalotech Expansion 2019-04-13 22:44:52 -04:00
Neerti
b9adc37685 Standardizes rotation verbs 2019-03-27 03:17:07 -04:00
Anewbe
8fc3cdfb3e Merge pull request #5647 from lbnesquik/Kates-Mining-Tweak 
Add a noise for mining scanners.
 2018-10-15 15:48:30 -04:00
Anewbe
c2794c571d Hopefully fixes some tool-conversion things 2018-08-03 15:13:29 -05:00
Anewbe
729ce71aa0 Converts most istype(thing,tool) procs into an appropriate thing.is_tool() format 2018-08-02 21:45:15 -05:00