Commit Graph

2603 Commits

Author SHA1 Message Date
Nadyr
400e685acf Merge branch 'master' into upstream-merge-10502 2021-05-31 03:17:04 -04:00
Nadyr
366fd4f97b Merge pull request #2086 from CHOMPStationBot/upstream-merge-10479
[MIRROR] Ports Runechat
2021-05-31 03:11:13 -04:00
Chompstation Bot
dd630bc529 Couple more runefixes 2021-05-31 03:57:40 +00:00
Aronai Sieyes
e89052c292 Merge pull request #10505 from VOREStation/Arokha/miscfix
Some misc runtime fixes
2021-05-31 03:57:35 +00:00
Chompstation Bot
95700efbe8 Fix chat message on different size mobs 2021-05-31 00:30:57 +00:00
Chompstation Bot
4476e4104d Ports Runechat 2021-05-30 22:51:20 +00:00
Chompstation Bot
92c2ebed60 [MIRROR] Voidsuit Balance Overhaul 2021-05-29 19:32:08 +00:00
Nadyr
ce20d09e0c Merge pull request #2054 from CHOMPStationBot/upstream-merge-10433
[MIRROR] [MIRROR] Linter Introduction + Cleanup
2021-05-27 21:35:05 -04:00
Chompstation Bot
20e3b0a2d3 [MIRROR] Linter Introduction + Cleanup 2021-05-27 16:31:50 +00:00
Novacat
6c9340a5b5 Merge pull request #10439 from Novacat/nova-heterochromia
Adds bus mapping units and mapping beacons
2021-05-27 02:24:41 +00:00
Novacat
238d8f2a2b Merge pull request #10413 from KillianKirilenko/kk-suits2
Expedition Medic Cargo Crate
2021-05-25 18:15:23 +00:00
Chompstation Bot
2b3041e7b6 [MIRROR] Wall-mounted Geiger Counters 2021-05-23 22:27:56 +00:00
Novacat
5d69f8878d Merge pull request #10373 from ShadowLarkens/fix_vending
Initialize all vending products on server start & fix multiple food icons
2021-05-22 03:50:10 +00:00
Chompstation Bot
c4161dc8d0 Adds some fennec treats 2021-05-20 19:55:01 +00:00
tyger
817d163c1c there, i guess 2021-05-19 10:49:59 +02:00
Chompstation Bot
643e532256 [MIRROR] Adds persistent smartfridges for garden products, material sheets 2021-05-13 20:53:58 +00:00
Novacat
86ab1a8363 Merge pull request #10303 from VOREStation/Arokha/removeoldnifmenu
Deprecate NIF statpanel in favor of TGUI
2021-05-12 17:46:40 +00:00
Chompstation Bot
2612365204 [MIRROR] Brings back old tesh radsuit sprites, adds 'fitted' version. 2021-05-11 23:58:55 -04:00
Nadyr
d2163812bb Merge pull request #1937 from CHOMPStationBot/upstream-merge-10273
[MIRROR] [MIRROR] Adds verb to VV global variables
2021-05-11 23:55:42 -04:00
Nadyr
5cc75e6770 Merge pull request #1935 from CHOMPStationBot/upstream-merge-10271
[MIRROR] Adds pizza guy uniform | CHOMP: Also manually adding wolf pelt apparently
2021-05-11 23:26:03 -04:00
Chompstation Bot
d7f20396de Personal crafting & Dependencies 2021-05-11 22:43:33 -04:00
Razgriz
e38b1d0b5e Merge pull request #1915 from CHOMPStationBot/upstream-merge-10269
[MIRROR] Adds Jams Sensors belly mode addon
2021-05-11 15:45:00 -07:00
Chompstation Bot
c136e96487 [MIRROR] Adds verb to VV global variables 2021-05-11 13:06:50 +00:00
Chompstation Bot
8ddc95a405 Adds pizza guy uniform 2021-05-11 13:06:38 +00:00
Chompstation Bot
9e9452bd2f Readd nif softshop descriptions as tooltips 2021-05-10 07:12:36 -04:00
Novacat
ff41a0fc27 Merge pull request #10269 from Heroman3003/jam-them-sensors
Adds Jams Sensors belly mode addon
2021-05-09 12:55:44 +00:00
Nadyr
718abb2fe6 Merge pull request #1889 from CHOMPStationBot/upstream-merge-10246
[MIRROR] [MIRROR] weather sounds adjustments
2021-05-08 08:31:48 -04:00
Nadyr
b7ea40f46c Merge pull request #1905 from CHOMPStationBot/upstream-merge-10221
[MIRROR] Disables Suit Sensors in Dorms
2021-05-08 08:09:27 -04:00
Aronai Sieyes
f809f30c72 Merge pull request #10221 from Novacat/nova-basicfixes
Disables Suit Sensors in Dorms
2021-05-06 17:34:15 +00:00
Chompstation Bot
644108b2d9 [MIRROR] weather sounds adjustments 2021-05-05 18:46:21 +00:00
Chompstation Bot
2d30c1c04e Exploration Balance Tweaks 2021-04-26 18:14:21 +00:00
Nadyr
e0c61bacf5 Merge pull request #1795 from CHOMPStationBot/upstream-merge-10129
[MIRROR] Miscellaneous Sundries
2021-04-11 23:11:43 -04:00
Chompstation Bot
e26ff2e5cb Miscellaneous Sundries 2021-04-11 17:54:34 +00:00
Nadyr
99dc45013a Merge pull request #1782 from CHOMPStationBot/upstream-merge-10117
[MIRROR] [MIRROR] Autolathes don't spam debug on first use
2021-04-11 06:07:52 -04:00
Nadyr
a494347a7e Merge branch 'master' into upstream-merge-10095 2021-04-11 03:34:32 -04:00
Razgriz
a721affb95 Fix comment spelling
I don't give a shit if it's a comment. You don't just edit a comment for no reason just to misspell "duplication" as "duplaction". I'm putting that back to normal. My OCD demands it.
2021-04-10 22:20:55 -07:00
Novacat
aa8abda597 Merge pull request #10117 from VOREStation/upstream-merge-8019
[MIRROR] Autolathes don't spam debug on first use
2021-04-10 12:36:45 +00:00
Chompstation Bot
588179bd66 Remove unnecessary 'signatures' 2021-04-08 16:48:30 +00:00
Chompstation Bot
6ce0b7ee4e Make unnatural resizing even better and more efficient with the power of DCS™️ 2021-04-08 15:15:21 +00:00
Nadyr
8019cd3421 Merge pull request #1386 from CHOMPStationBot/upstream-merge-9445
[MIRROR] [MIRROR] Department and Round Goals
2021-03-30 03:46:36 -04:00
Nadyr
2d6c3c92e6 Merge branch 'master' into upstream-merge-9632 2021-03-30 02:41:50 -04:00
Nadyr
b25a19712f Merge pull request #1699 from CHOMPStationBot/upstream-merge-10043
[MIRROR] Smole world beta Quick fix.
2021-03-30 02:40:21 -04:00
Nadyr
70c292debf Merge pull request #1695 from CHOMPStationBot/upstream-merge-10036
[MIRROR] Makes modifying ID cards not change the department if rank wasn't changed
2021-03-30 01:54:58 -04:00
Novacat
839b88c0fc Merge pull request #10043 from H0lySquirr3l/master
Smole world beta Quick fix.
2021-03-29 21:00:32 +00:00
Novacat
977e492f60 Merge pull request #10036 from Heroman3003/department-preserve
Makes modifying ID cards not change the department if rank wasn't changed
2021-03-29 13:43:56 +00:00
Chompstation Bot
1ad694dcf0 [MIRROR] Repathed/renamed seromi to teshari. 2021-03-28 21:33:04 +00:00
Nadyr
cb17eace95 Merge pull request #1681 from CHOMPStationBot/upstream-merge-9976
[MIRROR] Micro March beta update.
2021-03-28 00:50:43 -04:00
Nadyr
6e406614be Merge pull request #1679 from CHOMPStationBot/upstream-merge-10023
[MIRROR] [MIRROR] Ported updated decls repository from Neb.
2021-03-28 00:08:04 -04:00
Nadyr
8c01fbb78d Merge pull request #1655 from CHOMPStationBot/upstream-merge-9989
[MIRROR] [MIRROR] New ID Card Design
2021-03-27 21:52:28 -04:00
Chompstation Bot
8db3a020a0 Micro March beta update. 2021-03-26 23:23:02 +00:00