Commit Graph

778 Commits

Author SHA1 Message Date
Nadyr
680cffa88a Merge pull request #3211 from CHOMPStation2/upstream-merge-11928
[MIRROR] Offmap Tweaks
2021-12-05 14:04:20 -05:00
Nadyr
dce81c41e8 powder that makes you say yes 2021-12-05 13:11:46 -05:00
Casey
c6d3fc59a5 Merge pull request #11946 from Heroman3003/hearfix
Fixes vertical noise spread penetrating floors
2021-12-03 07:14:34 +00:00
Casey
fe8c4753eb Offmap Tweaks 2021-12-03 07:14:17 +00:00
Verkister
0df7ea6f9b Probably fixes the constant crashing.
Attack log query cleanups had had their cleanup part snipped out a while ago, and later sneakily reimplemented as a part of the cleanup subsystem that got untestmerged. Reverts the old guesswork PR that castrated the original attack log query cleanup.
2021-11-16 00:18:24 +02:00
Aronai Sieyes
bbdb043529 Merge pull request #11507 from VOREStation/Arokha/talonbans
Add talon as bannable, shuffle ban panel
2021-08-27 00:11:47 +00:00
Nadyr
6c91cb7292 Merge branch 'master' into upstream-merge-11456 2021-08-24 23:02:14 -04:00
Nadyr
2a876c6885 Merge pull request #2862 from CHOMPStationBot/upstream-merge-11431
[MIRROR] Add rollover safety check
2021-08-24 22:58:01 -04:00
Aronai Sieyes
64e0604641 Merge pull request #11431 from VOREStation/Arokha/rolloversafety
Add rollover safety check
2021-08-25 00:00:48 +00:00
Chompstation Bot
dc5e465c07 Fix rollover even harder 2021-08-24 23:59:23 +00:00
Novacat
827f9ebbbf Merge pull request #11477 from VOREStation/upstream-merge-8223
[MIRROR] Updates wine reagent id to redwine.
2021-08-24 23:57:24 +00:00
Chompstation Bot
2967ef4416 Fancy sprited shuttles 2021-08-06 22:15:49 +00:00
Aronai Sieyes
fb491666a0 Merge pull request #11226 from VOREStation/Arokha/between
Remove the between() proc
2021-07-24 17:04:21 +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
6470bc0080 Merge pull request #2619 from CHOMPStationBot/upstream-merge-11188
[MIRROR] Remove tons of pointless helpers
2021-07-20 21:25:43 -04:00
Nadyr
afed66bf34 powder that makes you say yes 2021-07-20 20:34:51 -04:00
Aronai Sieyes
60f60e58f4 Merge pull request #11188 from VOREStation/Arokha/colorhelpers
Remove tons of pointless helpers
2021-07-20 23:02:01 +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
Nadyr
20e6781341 Merge pull request #2553 from CHOMPStationBot/upstream-merge-11080
[MIRROR] Ports new Bay SolGov suits as Commonwealth suits
2021-07-15 20:26:17 -04:00
Chompstation Bot
3d2783aec7 Ports new Bay SolGov suits as Commonwealth suits 2021-07-15 19:29:34 -04:00
Chompstation Bot
9acb3a208e Removes unnecessary, unused, and redundant helpers. 2021-07-14 17:57:22 +00:00
Nadyr
57e1641a43 Merge pull request #2531 from CHOMPStationBot/upstream-merge-11048
[MIRROR] Reduce tgui logging
2021-07-13 22:55:56 -04:00
Aronai Sieyes
a28df02a59 Merge pull request #11048 from VOREStation/Arokha/tguilog
Reduce tgui logging
2021-07-12 23:47:53 +00:00
Aronai Sieyes
85b0fbdd30 Merge pull request #11043 from VOREStation/Arokha/uavview
Make UAVs not work at impossible distances
2021-07-12 23:46:20 +00:00
Nadyr
e70d9f291c Merge pull request #2489 from CHOMPStationBot/upstream-merge-10996
[MIRROR] Fix bitwise ops broken in caee8d45
2021-07-10 02:35:57 -04:00
Nadyr
19630dcdcc Merge pull request #2477 from CHOMPStationBot/upstream-merge-10946
[MIRROR] Makes time/tram use REALTIMEOFDAY rather than world.time
2021-07-10 01:46:02 -04:00
Nadyr
ca3ccb5ff2 Merge branch 'master' into upstream-merge-10996 2021-07-10 01:42:08 -04:00
Nadyr
f27ac30e5a Merge pull request #2478 from CHOMPStationBot/upstream-merge-10979
[MIRROR] Port current SSgarbage from /tg/
2021-07-10 01:37:07 -04:00
Nadyr
7476daf3f8 powder that makes you say yes 2021-07-10 01:29:23 -04:00
Nadyr
96f0ab5e37 powder that makes you say yes 2021-07-10 01:27:04 -04:00
Nadyr
7285e94ef0 powder that makes you say yes 2021-07-10 01:25:10 -04:00
Chompstation Bot
db993cd583 Fix bitwise ops broken in caee8d45 2021-07-09 18:16:15 +00:00
Aronai Sieyes
f835374f26 Merge pull request #10980 from MarinaGryphon/issue/8289
Expands do_after/do_mob exclusive var to affect target
2021-07-09 16:14:12 +00:00
Chompstation Bot
8b3a896d98 Port current SSgarbage from /tg/ 2021-07-09 16:13:02 +00:00
Chompstation Bot
ffbd66852b Makes time/tram use REALTIMEOFDAY rather than world.time 2021-07-09 15:54:38 +00:00
Nadyr
56649cac06 Merge pull request #2439 from CHOMPStationBot/upstream-merge-10928
[MIRROR] SSInput and Diagonal Movement
2021-07-07 23:53:36 -04:00
Chompstation Bot
1513fbe0cb SSInput and Diagonal Movement 2021-07-07 18:35:44 +00:00
Chompstation Bot
6c3930fa81 Vore fixes 2021-07-07 15:50:29 +00:00
Razgriz
c5b59f129a Update logging.dm 2021-07-05 18:14:43 -07:00
Nadyr
78698322b8 Merge pull request #2417 from CHOMPStationBot/upstream-merge-10907
[MIRROR] Fixes #10896
2021-07-05 16:19:18 -04:00
Chompstation Bot
6b6a138221 Fixes #10896 2021-07-05 16:19:51 +00:00
Aronai Sieyes
90768085c8 Merge pull request #10890 from VOREStation/Arokha/hairfix
Fixes #10884
2021-07-05 06:32:31 +00:00
Chompstation Bot
9eeb02ce42 Various HUD job icons additions and adjustments 2021-07-04 02:11:03 +00:00
Chompstation Bot
e0ff2b4ffe Port various backpacks 2021-07-04 00:38:04 +00:00
Razgriz
e3a9cd3775 Merge branch 'master' into upstream-merge-10764 2021-07-03 00:26:13 -07:00
Chompstation Bot
bf04ca9003 Port /tg/ vis_contents openspace 2021-06-30 19:49:25 +00:00
Chompstation Bot
b6e1989a01 The One Where I Port Modals 2021-06-30 19:29:34 +00:00