cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-06-23 15:23:17 +01:00
Code Issues Packages Projects Releases Wiki Activity
77,111 Commits 10 Branches 0 Tags
b90f7ec922fab98166ddb6471619ef181894de38
Commit Graph

661 Commits

Author SHA1 Message Date
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
CHOMPStation2 aab270c74f [MIRROR] remove static chat colour tags (#7635) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: Guti <32563288+TheCaramelion@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
Co-authored-by: Changelogs <action@github.com>
Co-authored-by: Aroliacue <96730930+Aroliacue@users.noreply.github.com>
Co-authored-by: Eli <fracshun@gmail.com>
Co-authored-by: tacoguy7765093 <karokaromaro@gmail.com>
Co-authored-by: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Co-authored-by: TheGreatKitsune <88862343+TheGreatKitsune@users.noreply.github.com>
Co-authored-by: Missile597 <150307788+Missile597@users.noreply.github.com>
 2024-01-29 18:45:19 -05:00
CHOMPStation2 a4280d14e1 [MIRROR] Many bug fixes, QoL, and PDA notes port (now with sensible diffs) (#7588) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Co-authored-by: Nadyr <forlirnglacignis@gmail.com>
 2024-01-19 09:26:26 -05:00
Kashargul 338ea5620e Blade re-add, minor item naming fixes, more icons for paperwork (#7265) 2023-12-01 21:55:18 +01:00
CHOMPStation2 016c9a38e7 [MIRROR] Creates prompt to rename faxes if using default name, updates bundle naming logic (#7149) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Co-authored-by: Darlantan <forlirnglacignis@gmail.com>
 2023-10-31 17:27:32 -04:00
CHOMPStation2 0b8908413e [MIRROR] Paper Scooping Minifix (#7088) 
Co-authored-by: Selis <sirlionfur@hotmail.de>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2023-10-24 20:21:05 -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
CHOMPStation2 433269b967 [MIRROR] HOT Paper Scooping ACTION: the SEQUEL (#7002) 
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2023-09-18 18:13:57 +02:00
CHOMPStation2 1da6b8346d [MIRROR] HOT Paper Scooping ACTION (#6905) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2023-09-03 17:49:57 +02:00
CHOMPStation2 613c510a68 [MIRROR] Tweak: Makes it possible to stand on same tile as fax machine (#6887) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2023-08-31 10:39:53 +02:00
CHOMPStation2 bb04229485 [MIRROR] Valid HREF token for fax view button (#6865) 
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2023-08-25 08:51:44 +02:00
CHOMPStation2 c0dc39dd55 [MIRROR] A variety of fixes (#6843) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2023-08-20 09:20:55 +02:00
CHOMPStation2 b7a83db35d [MIRROR] Multiple Fax machine tweaks, additions incl incorporation of staff request to main GUI (#6719) 
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2023-08-14 14:58:59 +02:00
Heroman3003 2281afdf24 More 515 Compatibility 2023-06-05 21:21:35 +00:00
Sharkmare 32bd3c5ab3 nukes closing statements for rows and cells 
They dont exist in Paperwork markdown and ommiting their existance should also make universal paperwork generation simpler
 2023-03-31 12:25:26 +02:00
Razgriz a5037f3180 Revert "[MIRROR] Runtime fixes" 2023-02-12 19:03:56 -07:00
Casey 2891dc3ea7 Merge pull request #14476 from Heroman3003/runtime-17 
Runtime fixes
 2023-02-12 18:21:37 +00:00
Razgriz 0de044b1ba Merge pull request #5433 from CHOMPStation2/upstream-merge-14219 
[MIRROR] A few fixes
 2022-12-26 16:57:54 -07:00
Casey d21fd301a0 Merge pull request #14216 from TankTheBirb/holster-stuff 
ticket printers and folders are now holsterable
 2022-12-23 16:24:01 +00:00
Casey 8f0cf2a4dc A few fixes 2022-12-23 16:23:56 +00:00
Novacat 1e7cbec2e3 Missing href token adds 2022-12-15 20:43:47 +00:00
TheGreatKitsune 0e8c626505 Share the fax sound with the sender 2022-10-15 22:21:28 -05:00
Casey 897c1135fa Merge pull request #13883 from Heroman3003/assorted-fix 
Allows ID to be inserted into fax machine by clicking it + 2 minor fixes
 2022-10-10 03:08:35 +00:00
Desert 210813ef44 Clown stamp is now usable by alt title entertainers FIXES #4965 2022-09-20 18:47:08 -05:00
Nadyr 6a6e5cc70a Merge branch 'master' into upstream-merge-13519 2022-08-17 18:02:22 -04:00
Casey 3053b70213 Small Staff Request addition 2022-08-17 20:28:12 +00:00
Casey 796ae69274 Experimental implementation of automated role pings 2022-08-16 08:01:16 +00:00
Nadyr 04e2aaeb60 powder that makes you say yes 2022-06-23 00:17:11 -04:00
Nadyr ed5300430a powder that makes you say yes 2022-06-23 00:16:42 -04:00
Casey 5788a26593 Input Fixes 2022-06-22 23:54:36 -04:00
Nadyr a2d9c8b58a Merge branch 'master' into upstream-merge-13122 2022-06-22 22:37:44 -04:00
Nadyr e81e1f4faf Merge branch 'master' into upstream-merge-13112 2022-06-22 21:58:12 -04:00
Casey a3dd6b8ffa TGUI Input Framework 2022-06-22 19:19:55 -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 a7fcc1487c Merge pull request #12891 from VOREStation/upstream-merge-8599 
[MIRROR] Toner has a sprite again
 2022-05-08 09:46:51 +00:00
Casey 654d2218f2 Merge pull request #12667 from GhostActual/aurora_bureaucracy 
Aurora Bureaucracy
 2022-04-06 08:26:10 +00:00
Verkister 3a3f31f7fb Earlyports fix for illiterate mobs 
Fixes paper text contents being censored to simplemobs with universal_understand enabled.
 2022-03-19 20:21:13 +02:00
Casey 58a5611395 Merge pull request #12291 from Heroman3003/8330-fix 
8330 fix
 2022-02-19 22:33:38 +00:00
Casey 8ee12c5a16 Merge pull request #12148 from KillianKirilenko/kk-test 
[station] tag for paperwork
 2022-02-04 04:16:47 +00:00
Casey 6004382872 Custom item for Coolcrow420, minor change to stamp code 2021-12-04 01:28:37 +00:00
Aronai Sieyes 0f2f5cb482 Merge pull request #11615 from VOREStation/upstream-merge-8311 
[MIRROR] Remove suicide act
 2021-10-28 00:49:05 +00:00
Aronai Sieyes c37ae601b6 Merge pull request #11442 from GhostActual/baggage 
Fulpstation Briefcases
 2021-08-25 00:00:00 +00:00
Aronai Sieyes 7551fa2954 Merge pull request #11255 from Verkister/patch-75 
Fixes photo code still using step_x/y
 2021-07-26 13:32:57 +00:00
Nadyr 2ac3993558 Merge pull request #2617 from CHOMPStationBot/upstream-merge-11179 
[MIRROR] Optimize a couple things
 2021-07-20 21:45:26 -04:00
Nadyr 9861e0769b powder that makes you say yes 2021-07-20 20:54:03 -04:00
Chompstation Bot 15cafbe65b Optimize a couple things 2021-07-20 21:30:20 +00:00
Chompstation Bot 481c0e314e Convert some bools to TRUE/FALSE instead of 1/0. 2021-07-16 17:44:40 +00:00
Chompstation Bot 287a5deee3 Use material defines more 2021-07-07 19:02:05 +00:00