cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-06 15:34:35 +00:00
Code Issues Packages Projects Releases Wiki Activity
70,087 Commits 6 Branches 0 Tags
5033e705f24680bdc4cd48950f923de97aaad708
Commit Graph

633 Commits

Author SHA1 Message Date
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
Aronai Sieyes
c449ea0a52 Merge pull request #10925 from VOREStation/Arokha/faxes 
Fixes #10919
 2021-07-05 23:57:46 +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
Chompstation Bot
fb343cec6c [MIRROR] Linter diagnostics + bans non-var relative pathing 2021-06-22 22:17:02 +00:00
Chompstation Bot
55e3dc7904 Port current /tg/ lighting system 2021-06-18 04:23:09 +00:00
Chompstation Bot
78acd45edc Remove extra asterisks from rune audible messages 2021-05-31 17:26:54 +00:00
Chompstation Bot
4476e4104d Ports Runechat 2021-05-30 22:51:20 +00:00
Nadyr
0f6f622cd9 Merge pull request #2056 from CHOMPStationBot/upstream-merge-10316 
[MIRROR] [MIRROR] Ports Nebula's Discord Webhook Integration
 2021-05-27 21:36:38 -04:00
Nadyr
fffff211a0 powder that makes you say yes 2021-05-27 20:30:12 -04:00
Chompstation Bot
34143b83cf [MIRROR] Ports Nebula's Discord Webhook Integration 2021-05-27 16:35:07 +00:00
Chompstation Bot
20e3b0a2d3 [MIRROR] Linter Introduction + Cleanup 2021-05-27 16:31:50 +00:00
Sym
8ca11f0439 Changing player Xenomorphs to Genaprawns 2021-03-26 19:42:08 -04:00
Chompstation Bot
b7b8682e7c [MIRROR] Added think-tanks. 2021-03-18 14:57:26 +00:00
Chompstation Bot
ad57e1ad13 [MIRROR] Sideports a couple of init unit tests from Neb. 2021-02-27 18:45:36 +00:00
Cadyn
3995353b03 Bot cleanup and config 
Cleaning my code up and adding stuff to config
 2021-02-24 16:05:49 -08:00
Cadyn
51ce2042af Faxes and ahelps admin channel changes 2021-02-24 13:36:31 -08:00
Cadyn
bbb338edba Auto stash before merge of "tgs4" and "origin/master" 2021-02-23 03:02:32 -08:00
Cadyn
07775449d7 Fixing conflicts 2020-10-05 18:10:53 -07:00
Razgriz
54e632ebf2 September 2020 Upstream Merge 2020-09-25 23:07:08 -07:00
Novacat
d49640431d Merge pull request #9062 from ShadowLarkens/tgui_finale 
NanoUI Goes To Brazil
 2020-09-21 14:13:16 -04:00
Cerebulon
95ff8c2080 Tweaks to pickup/equip sounds. 2020-09-20 06:57:07 -04:00
ShadowLarkens
d9d3bc61f3 Quickfix for fax machines not working 2020-09-20 02:45:04 -07:00
ShadowLarkens
375e178046 TGUI Photocopier & Guest Pass 2020-09-20 00:07:09 -07:00
ShadowLarkens
ca60db08aa TGUI Fax Machine 2020-09-19 22:36:34 -07:00
izac112
4b051c23fc Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-09-13 15:05:53 +02:00
ShadowLarkens
c32f05e1f7 TGUI Civilian 
UI's Converted:
 - Aurora Cooking
 - Chaplain Book Selection
 - ColorMate
 - Cryo Storage
 - Holodeck
 - Jukebox
 - Looking Glass
 - Microwave
 - Newscasters
 - Timeclock
 - Vending Machine Improvements
 2020-09-02 13:32:42 -07:00
Novacat
28c19ee066 Merge pull request #8868 from VOREStation/upstream-merge-7571 
[MIRROR] Colony Director -> Site Manager
 2020-08-28 13:17:58 -04:00
Atermonera
21c1b12ef1 Colony Director -> Site Manager 2020-08-27 20:43:04 -04:00