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
66,269 Commits 5 Branches 0 Tags
e4d8e5263e98d6c5655d292355f17be3e986e45d
Commit Graph

618 Commits

Author SHA1 Message Date
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
Rykka
d2fb9a7691 Rebase onto Master for Volume Control Panel, Squash Commits 2020-08-27 19:47:38 -04:00
izac112
48af4c881c Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-22 20:07:45 +02:00
Novacat
89b0fa6b79 Merge pull request #8708 from Rykka-Stormheart/shep-dev-persistence-megapatch 
Persistence Patch
 2020-08-21 01:14:04 -04:00
ShadowLarkens
0231088057 TGUI Notice Board 2020-08-16 22:27:08 -07:00
Rykka
ad6870c78d Persistence Patch 
- Fixes Paper and font tags stacking across rounds, as shown in: ![](https://cdn.discordapp.com/attachments/187013248309002240/741937939382141000/164fdd3a37fb22f18dfa9b5c431ffc04.png)

- Fixes Graffiti being persistent for over 50 rounds (10+ days)
- Sets Trash to be persistent for 4 rounds instead of 5
- Fixes Persistence being always-on because of if("persistence_enabled") config.persistence_enabled = 1. As explained: 
> it's on by default, which means config.txt will be read and if it's not there it stays at 1. If it is there,it gets set to 1. There is no way to disable it

- Adds config options to enable/disable **Persistence for Maploaded objects**, as well as a verb to toggle such.
- Adds Persistence to config.

Currently IGNORE_MAPLOAD for Persistance is **Disabled.**
Maploaded objects/dirt/etc will be saved by persistence, preserving current behavior.
 2020-08-16 09:48:46 -04:00
izac112
5c02633707 Merge branch 'izac' of https://github.com/Yawn-Wider/YWPolarisVore; branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-13 20:01:22 +02:00
ShadowLarkens
6215434bc3 TGUI File Cabinets 2020-08-11 06:31:29 -07:00
izac112
81871a960e Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-10 21:50:42 +02:00
Razgriz
f00fdebbb9 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into August2020UpstreamPull 
August2020UpstreamPull
 2020-08-09 02:58:18 -07:00
Atermonera
91587c6904 Merge pull request #7398 from Cerebulon/stickyfixy 
Stickynote tweaks
 2020-08-08 23:50:23 -04:00
LunarFleet
b5a8a6944c Fax machine comments 
(Feed me paper)
 2020-07-27 18:26:35 -04:00
izac112
601a155b30 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-07-25 15:22:42 +02:00
Cerebulon
8b031dd8ad Persistent Trash/Dirt/Graffiti/Notices 2020-07-24 05:24:56 -04:00
LunarFleet
5daabf8c0c Unity Hound Parts 2020-07-22 23:10:51 -04:00
Razgriz
02421b075e Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into July2020UpstreamPull 2020-07-12 16:14:45 -07:00