cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
64,899 Commits 5 Branches 0 Tags
c30f4c2dbcb019309d72114f945b920eb8fa3e4c
Commit Graph

64899 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aronai Sieyes
c30f4c2dbc Merge pull request #10867 from VOREStation/Fixes/10787 
Fix excessive table merge, convert climbers lazy
 2021-07-04 22:48:12 +00:00
Nadyr
0b9ebd3c6a Merge pull request #2400 from CHOMPStationBot/upstream-merge-10865 
[MIRROR] Fix newscaster tgui missing 'title' setting
 2021-07-04 16:40:54 -04:00
Nadyr
0a80e5f455 Merge pull request #2399 from CHOMPStationBot/upstream-merge-10864 
[MIRROR] Change chat message boxes to resizable tgui
 2021-07-04 16:34:49 -04:00
Darlantan
77c3f3c911 bundle fix 2021-07-04 16:30:34 -04:00
Chompstation Bot
dac390bffe Fix newscaster tgui missing 'title' setting 2021-07-04 16:20:16 -04:00
Nadyr
797fe76ada Merge branch 'CHOMPStation2:master' into upstream-merge-10864 2021-07-04 16:14:12 -04:00
Nadyr
70f951b691 Merge pull request #2398 from CHOMPStationBot/upstream-merge-10862 
[MIRROR] More decorations, fancy suit dispenser, angry generator
 2021-07-04 16:10:02 -04:00
Nadyr
479d5129d6 Merge pull request #2397 from CHOMPStationBot/upstream-merge-10860 
[MIRROR] Adds tgui-style input modals for text, message, and num
 2021-07-04 15:33:28 -04:00
Darlantan
efdd8a8a0c bundle fix 2021-07-04 15:04:57 -04:00
Chompstation Bot
8436ef0f5a Change chat message boxes to resizable tgui 2021-07-04 05:17:41 +00:00
Aronai Sieyes
c2df539965 Merge pull request #10864 from VOREStation/Arokha/erpking 
Change chat message boxes to resizable tgui
 2021-07-04 05:17:41 +00:00
Chompstation Bot
a18242eb87 More decorations, fancy suit dispenser, angry generator 2021-07-04 04:29:52 +00:00
Aronai Sieyes
fdf4e56451 Merge pull request #10862 from VOREStation/Icons/moredeco 
More decorations, fancy suit dispenser, angry generator
 2021-07-04 04:29:52 +00:00
Chompstation Bot
f32c5af649 Adds tgui-style input modals for text, message, and num 2021-07-04 04:24:41 +00:00
Razgriz
080e08c183 Merge pull request #2395 from CHOMPStationBot/upstream-merge-10859 
[MIRROR] Random item missing sprites
 2021-07-03 20:59:32 -07:00
Chompstation Bot
5bf3ee1434 Random item missing sprites 2021-07-04 03:17:27 +00:00
Aronai Sieyes
d87b3c84e5 Merge pull request #10859 from VOREStation/Arokha/iconfixes 
Random item missing sprites
 2021-07-04 03:17:27 +00:00
Nadyr
23e39aa550 Merge pull request #2394 from CHOMPStationBot/upstream-merge-10858 
[MIRROR] Fixes a couple icon issues
 2021-07-03 22:49:18 -04:00
Nadyr
249b7463d5 Merge pull request #2393 from CHOMPStationBot/upstream-merge-10849 
[MIRROR] Port in-game painting from /tg/
 2021-07-03 22:48:33 -04:00
Chompstation Bot
7b77a01677 Fixes a couple icon issues 2021-07-04 02:36:46 +00:00
Aronai Sieyes
10178c4db0 Merge pull request #10858 from VOREStation/Arokha/iconfixes 
Fixes a couple icon issues
 2021-07-04 02:36:45 +00:00
Darlantan
6b6b3ddb68 bundle fix 2021-07-03 22:33:10 -04:00
Nadyr
4e8d06b14d powder that makes you say yes 2021-07-03 22:31:15 -04:00
Chompstation Bot
275458f14a Port in-game painting from /tg/ 2021-07-03 22:31:15 -04:00
Nadyr
e276b7aba0 Merge pull request #2391 from CHOMPStationBot/upstream-merge-10855 
[MIRROR] Various HUD job icons additions and adjustments
 2021-07-03 22:28:26 -04:00
Nadyr
ede75d6e6f Merge pull request #2392 from CHOMPStationBot/upstream-merge-10856 
[MIRROR] Improve tgui alert and list input modals
 2021-07-03 22:28:05 -04:00
Nadyr
f5bb6ceac7 Merge pull request #2390 from CHOMPStationBot/upstream-merge-10824 
[MIRROR] Replace cells with Eris cells
 2021-07-03 22:24:37 -04:00
Darlantan
6d75f154a4 bundle fix 2021-07-03 22:16:23 -04:00
Nadyr
c7f89f5ee2 powder that makes you say yes 2021-07-03 22:12:57 -04:00
Chompstation Bot
31a9bf5406 Improve tgui alert and list input modals 2021-07-04 02:12:11 +00:00
Nadyr
babb859f5f powder that makes you say yes 2021-07-03 22:11:19 -04:00
Chompstation Bot
9eeb02ce42 Various HUD job icons additions and adjustments 2021-07-04 02:11:03 +00:00
Nadyr
d0ecf25b5e Merge pull request #2389 from CHOMPStationBot/upstream-merge-10822 
[MIRROR] Eris multitool sprite
 2021-07-03 22:06:18 -04:00
Nadyr
7478f94c49 powder that makes you say yes 2021-07-03 22:05:44 -04:00
Nadyr
4ce0d8397c powder that makes you say yes 2021-07-03 21:59:07 -04:00
Chompstation Bot
c31b28755f Replace cells with Eris cells 2021-07-04 01:53:41 +00:00
Chompstation Bot
a02628e5c4 Eris multitool sprite 2021-07-04 01:52:34 +00:00
Aronai Sieyes
6708201eb7 Merge pull request #10822 from VOREStation/Icons/multitool 
Eris multitool sprite
 2021-07-04 01:52:34 +00:00
Nadyr
c21ee657fe Merge pull request #2385 from CHOMPStationBot/upstream-merge-10794 
[MIRROR] Port various backpacks
 2021-07-03 21:40:25 -04:00
Nadyr
23a4648f87 Merge pull request #2382 from CHOMPStationBot/upstream-merge-10854 
[MIRROR] Fix indentation
 2021-07-03 21:22:19 -04:00
Nadyr
9ac6347212 Merge pull request #2381 from CHOMPStationBot/upstream-merge-10846 
[MIRROR] Make smol holders use vis_contents
 2021-07-03 21:19:12 -04:00
Nadyr
24fd91203f Merge pull request #2388 from CHOMPStationBot/upstream-merge-10780 
[MIRROR] Port Eris grenade sprites
 2021-07-03 21:18:06 -04:00
Nadyr
6660a70e82 Merge pull request #2387 from CHOMPStationBot/upstream-merge-10782 
[MIRROR] Port Eris Trashbag of Holding
 2021-07-03 21:17:31 -04:00
Nadyr
dee2e4e792 Merge pull request #2380 from CHOMPStationBot/upstream-merge-10826 
[MIRROR] Port 5 /tg/ pai sprites
 2021-07-03 21:16:57 -04:00
Nadyr
55b85e0ccf Merge pull request #2386 from CHOMPStationBot/upstream-merge-10789 
[MIRROR] Port Bay microwave, utensil/kitchen knife sprites
 2021-07-03 21:16:45 -04:00
Nadyr
92ece8d5dc powder that makes you say yes 2021-07-03 21:15:53 -04:00
Nadyr
b53f03dde4 Merge pull request #2379 from CHOMPStationBot/upstream-merge-10835 
[MIRROR] Ports lots of sprites for decoration purposes
 2021-07-03 21:13:28 -04:00
Nadyr
0ed863a41c Merge pull request #2374 from CHOMPStationBot/upstream-merge-10840 
[MIRROR] Add discord button to top
 2021-07-03 21:13:06 -04:00
Nadyr
d4d23c69d9 Merge branch 'master' into upstream-merge-10854 2021-07-03 21:12:40 -04:00
Nadyr
1a71635f31 powder that makes you say yes 2021-07-03 21:10:02 -04:00