Mosley
0d9eebd20c
Merge remote-tracking branch 'upstream/master'
2025-04-24 17:03:15 -05:00
SandPoot
2d87780147
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2025-02-13 18:06:56 -03:00
SandPoot
56d972eb0b
all sorts of fixes and updates, may break stuff
2025-02-09 02:09:28 -03:00
Sim
c8983e1b03
Did you know Mosley pulls from downstreams without knowing what he pulls?
...
AKA [PORT] Refactors smiting, adds smite build mode tgstation/tgstation#55327
!! NOT!! A!! RUNNING!! BUILD!!
LIGHTNING IS BROKEN
IMMERSE IS COMMENTED OUT
HALF OF THIS SHIT IS BROKEN
DO NOT BASE YOURSELF ON THIS BUILD!!
2024-10-08 01:50:15 -03:00
BongaTheProto
493fa7f215
Merge branch 'master' into upstream-merge
2024-03-28 15:43:55 -05:00
BongaTheProto
b2e14a5393
Merge remote-tracking branch 'upstream/master' into upstream-merge
2024-03-24 17:02:38 -05:00
ariaworld and GitHub
a80e194143
Nevermind, this is easier to read
2024-03-19 11:16:17 +01:00
ariaworld and GitHub
96b2f9f7d4
Update severe.dm
2024-03-19 11:14:44 +01:00
ariaworld
5fef62f23e
Fix monophobia triggering when grabbed by a macro character
2024-03-16 14:54:17 +01:00
SandPoot
b76127c2d7
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2024-03-15 19:21:39 -03:00
SandPoot
676cb864b1
missed proc refs
2024-03-12 22:17:30 -03:00
SandPoot
a65f323734
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into proc-define-shit
2024-03-08 19:10:22 -03:00
BongaTheProto
d1b0e9ec9f
Merge remote-tracking branch 'upstream/master'
2024-03-01 21:15:28 -05:00
SandPoot
0b990039e3
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2024-01-16 18:00:55 -03:00
SandPoot
7eaef36e11
d k daunkey kaung
2024-01-03 22:42:03 -03:00
SandPoot
a558377206
more stuff i can't guarantee works by itself yet
2023-11-29 23:37:15 -03:00
SandPoot
40f1d7401d
procs
2023-11-29 22:40:13 -03:00
Tsurupeta
d4ec25e748
all else
2023-08-08 14:01:18 +03:00
BongaTheProto
2fa8d53b55
Merge remote-tracking branch 'upstream/master'
2023-01-20 13:18:03 -05:00
FelixRuin and GitHub
58090d704f
Monophobia vore and blind fix ( #289 )
2023-01-19 21:54:08 -03:00
BongaTheProto and GitHub
43829e47e4
Merge branch 'Sandstorm-Station:master' into master
2022-07-24 13:29:11 -05:00
SandPoot
8e71dbe371
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-07-24 15:07:34 -03:00
SandPoot
329e160a1f
/BiologicalLife(delta_time...
2022-07-20 21:40:53 -03:00
BongaTheProto
ffec4796fd
Stations update + portal panties fix (?)
...
- Updates tau and smol
- fixes a supposed runtime with portal panties
We haven't had problems with them so far so I'm scared this may just fuck them up. Always worth the try though
2022-04-26 23:12:03 -05:00
SandPoot
05349c27e9
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-04-15 23:43:43 -03:00
SandPoot
586a035132
Update files
2022-04-06 18:41:31 -03:00
SandPoot
bf69229ada
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-02-16 17:18:56 -03:00
silicons
ce6e8c99c6
fixes
2022-02-15 21:56:36 -07:00
SandPoot
2c4fcaba81
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-10-06 15:04:36 -03:00
DeltaFire
cd570be827
woo
2021-10-04 15:03:56 +02:00
SandPoot
e7d5275a70
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-09-20 14:32:29 -03:00
Timothy Teakettle
1665a45a5e
expunged
2021-09-17 16:26:22 +01:00
Timothy Teakettle
e2df9fec47
indentation
2021-09-17 12:26:11 +01:00
Timothy Teakettle
1ab63a69c5
Update mild.dm
2021-09-17 12:17:53 +01:00
SandPoot
1c2b219938
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-08-15 15:52:18 -03:00
SandPoot
ab9b824ce9
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-08-08 14:18:09 -03:00
bunny232 and GitHub
50cf7a85f8
Merge pull request #2 from Citadel-Station-13/master
...
a
2021-08-08 08:51:58 -04:00
Artur
82ccfc40dc
/obj/screen --> /atom/movable/screen
2021-07-29 13:57:19 +03:00
bunny232
c7a7346939
monophobia nerf
2021-07-19 07:36:22 -04:00
SandPoot
0d1a6c73fc
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-01-19 23:31:15 -03:00
Drathek and GitHub
2aea4bd969
Fix dangling parentheses breaking regex in hypnotic stupor ( #131 )
...
Added optional limits to how often a hypnotic stupor can apply a trance
(Cherry pick from [6f496bb] fixing config conflict with dogborg sleepers)
2021-01-12 07:56:41 -03:00
Letter N
a808f805d4
ASYNC EVERYTHING!
2020-12-21 16:24:51 +08:00
silicons
803bff4e5f
funny
2020-11-12 23:34:42 -07:00
silicons
ffd44b78ba
Merge remote-tracking branch 'citadel/master' into clickcd_experimental
2020-07-23 10:26:03 -07:00
silicons
98d3ac80d9
:pika:
2020-07-20 11:25:17 -07:00
Timothy Teakettle and GitHub
1a5008fee7
Merge branch 'master' into wound-port
2020-07-18 23:06:49 +01:00
timothyteakettle
584e74590f
port1
2020-07-17 02:01:33 +01:00
silicons
6ee63f66aa
whew
2020-07-07 20:48:54 -07:00
Ghommie
ae053a9a08
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit800
2020-06-23 03:12:49 +02:00
kevinz000
445d94f335
haha whew
2020-06-17 21:32:10 -07:00
Mosley