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
67,422 Commits 5 Branches 0 Tags
ce9f9ba5a0e898d64beb5be7c92018e06ec671c5
Commit Graph

2670 Commits

Author SHA1 Message Date
Casey
9163ddb85b Renames Engineer, new alt-titles for Stellar Delight 2021-12-12 08:46:53 +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
Casey
daef476a07 Merge pull request #11590 from VOREStation/upstream-merge-8291 
[MIRROR] Fixes changeling transform bug
 2021-09-24 04:09:05 +00:00
Chompstation Bot
15cafbe65b Optimize a couple things 2021-07-20 21:30:20 +00:00
Nadyr
5c7226fa54 Merge branch 'master' into upstream-merge-11110 2021-07-16 19:09:43 -04:00
Chompstation Bot
d0d23ed393 Fixes a bunch of bools missed in #11100 2021-07-16 21:12: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
16a731dd39 Move like every clothing icon file 2021-07-10 16:23:23 +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
Nadyr
8171e7736b Merge pull request #2303 from CHOMPStationBot/upstream-merge-10775 
[MIRROR] [MIRROR] Halves Item Slowdown Effects
 2021-07-01 21:30:30 -04:00
Chompstation Bot
b6e1989a01 The One Where I Port Modals 2021-06-30 19:29:34 +00:00
Chompstation Bot
c97b47de72 [MIRROR] Halves Item Slowdown Effects 2021-06-28 11:32:00 +00:00
Razgriz
54da6711ca powder that makes you say yes 2021-06-24 18:58:57 -07:00
Razgriz
ca56e2a5e4 powder that makes you say yes 2021-06-24 18:25:13 -07:00
Razgriz
01d95123da powder that makes you say yes 2021-06-24 18:19:12 -07: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
cb5671c638 Make req_[one_]access lazy 2021-05-31 17:30:12 +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
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
Nadyr
dfe6c73e93 Merge pull request #1781 from CHOMPStationBot/upstream-merge-10121 
[MIRROR] [MIRROR] Fixes worn or held teshari not counting as successfully transferred
 2021-04-11 06:30:11 -04:00
Nadyr
24eacca663 Update game_mode.dm 2021-04-11 06:20:42 -04:00
Nadyr
93d202e3fe Update core_obj.dm 2021-04-11 04:37:00 -04:00
Nadyr
04f00abe6c Update Holidays.dm 2021-04-11 04:34:56 -04:00
Chompstation Bot
9783e982a4 [MIRROR] Fixes worn or held teshari not counting as successfully transferred 2021-04-10 12:35:39 +00:00
Chompstation Bot
b7603497ce Fixup things for dm-langserver 2021-04-07 16:02:12 +00:00
Chompstation Bot
1ad694dcf0 [MIRROR] Repathed/renamed seromi to teshari. 2021-03-28 21:33:04 +00:00
Novacat
0a0440ed9c Merge pull request #10001 from Novacat/nova-basicfixes 
Technomancer Fixes
 2021-03-23 20:01:01 +00:00
Novacat
fea37c84c3 Merge pull request #9930 from Novacat/nova-basicfixes 
Slightly nerfs cold adaptation
 2021-03-12 23:22:55 +00:00
Nadyr
3bd7e2b888 Merge pull request #1320 from CHOMPStationBot/upstream-merge-9704 
[MIRROR] [MIRROR] Telecrystals are only stored on the mind
 2021-03-06 01:31:07 -05:00
Chompstation Bot
ad57e1ad13 [MIRROR] Sideports a couple of init unit tests from Neb. 2021-02-27 18:45:36 +00:00
Chompstation Bot
24b712ec4d [MIRROR] Telecrystals are only stored on the mind 2021-02-13 21:26:38 +00:00
Razgriz
12828949ab Fix number of peeps transfered 
Appended /centcom to the escape shuttle again to fix transfer message. Added some escape pods to the list.
 2021-02-01 18:37:06 -07:00
Razgriz
0a8521f900 Merge pull request #568 from cadyn/vspull 
Direct pull from virgo
 2020-10-06 20:52:54 -07:00
Cadyn
07775449d7 Fixing conflicts 2020-10-05 18:10:53 -07:00
Sym
025397c417 Fixing the work of a moron. 
Just.. Im just frothing with rage while looking at some of this stuff. Some polaris dude named Neerti did a bunch of half assed commenting five years ago, and has been causing a shit ton of warning messages because of it. I ended up fixing most of it out of pure rage.

Tell me if you guys need a CHOMPedit on these, because this is mostly just fixing really stupid commented out stuff that should have been fixed years ago by the person that did this. I wouldn't think it would need a CHOMPedit, but you never know.
 2020-10-05 17:55:48 -04:00
Razgriz
54e632ebf2 September 2020 Upstream Merge 2020-09-25 23:07:08 -07:00
ShadowLarkens
3f191e4204 NanoUI Goes To Brazil 2020-09-20 02:36:46 -07:00
izac112
4b051c23fc Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-09-13 15:05:53 +02:00
Erik
b71dc4807f Adding CHOMPEdits 2020-09-09 06:52:04 -07:00
Erik
430c15bcef Clear Skies Ahead! 
Clears up a hell of a lot of clutter with all of the pre-defined areas of shuttles to properly use the landmarks system. Now there's a ton of free room to build and/or allow larger shuttles to dock with the station, as well as allowing overmap shuttles to dock at the docks.
 2020-09-05 00:26:04 -07:00
Rykka
9841414da6 Adds Toggles to Revert to Legacy Door Sounds and Enable Department Doors 
Self-explanatory.

Adds toggle to go back to the old-school SS13 legacy airlock sounds, including the glass windoor airlock sounds, and a toggle to disable the per-department door sounds, which some found jarring/unrealistic.

If Per-Department sounds are disabled, the department doors will use hall1o/c for open/close respectively, following maintainer-requested behavior for these doors.

This also relocates the following sounds to be inside machines/door for more consistency:
- airlock.ogg
- airlockclose.ogg
- airlockforced.ogg
- airlock_creaking.ogg
- boltsup.ogg
- boltsdown.ogg
- blastdoorclose.ogg
- blastdooropen.ogg
- windowdoor.ogg
 2020-08-29 03:04:34 -04:00
Heroman
ffdd8de3ce Site Management lookover for _vr stuff 2020-08-29 05:22:52 +10: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
ShadowLarkens
cefe1a0b3c TGUI Brig Timer, Prisoner Management Console, and Security Records 2020-08-18 07:57:13 -07:00