1e1fc329f8
Merge remote-tracking branch 'upstream/master' into upstream-merge
2024-04-13 14:12:39 -05:00
2e2528ee56
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2024-04-13 00:36:29 -03:00
91045350e5
overlay stuff
2024-04-12 22:01:03 -03:00
b2e14a5393
Merge remote-tracking branch 'upstream/master' into upstream-merge
2024-03-24 17:02:38 -05:00
b76127c2d7
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2024-03-15 19:21:39 -03:00
40f1d7401d
procs
2023-11-29 22:40:13 -03:00
d4ec25e748
all else
2023-08-08 14:01:18 +03:00
00dadda3df
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-08-07 23:15:57 -03:00
33889870c9
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits
2022-05-17 13:22:40 -07:00
05349c27e9
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-04-15 23:43:43 -03:00
2555843026
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload)
2022-04-09 03:06:56 -03:00
9df4ed8253
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-04-09 02:48:16 -03:00
586a035132
Update files
2022-04-06 18:41:31 -03:00
6199aa4d60
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits
2022-03-30 12:35:12 -07:00
0395ba47d7
Merge branch 'master' into Projectile_Rework
2022-03-11 23:07:31 -05:00
2fdb70b2b9
[DNM][DNM][WIP] Projectile backend code port and update
...
Ports#54924, #65061 , #59804 from /tg.
adds auxiliary code from /tg to make code work.
2022-03-06 15:20:23 -05:00
fb7a24b333
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-02-27 14:17:53 -03:00
5029af901b
Upload files
2022-02-25 16:58:09 -03:00
629ce5bea6
Station traits
2021-12-08 16:17:35 -08:00
e7d5275a70
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-09-20 14:32:29 -03:00
bdf46b1d46
meme pr
2021-09-18 04:53:17 -04:00
ab9b824ce9
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-08-08 14:18:09 -03:00
82ccfc40dc
/obj/screen --> /atom/movable/screen
2021-07-29 13:57:19 +03:00
a7cf902978
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-07-25 10:03:29 -03:00
90bc48f579
Some hallucination tweaks
2021-07-20 22:49:08 -07:00
6f15641f33
Thirst ( #151 )
...
* upload files
* upload files
* upload examine.dm
* Update modular_citadel/code/modules/reagents/chemistry/reagents/SDGF.dm
2021-04-03 19:54:56 -03:00
3d75d4f468
Nightmares! ( #142 )
2021-02-14 20:52:51 -03:00
0d1a6c73fc
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-01-19 23:31:15 -03:00
620a835b9b
Fix? for nullref during hallucination sleep ( #132 )
...
(cherry picked from commit 57044399fdd03b850de559625b91bce99cad3029)
2021-01-13 22:57:47 -03:00
a808f805d4
ASYNC EVERYTHING!
2020-12-21 16:24:51 +08:00
9d300ade35
Merge pull request #13677 from silicons/newlines
...
Adds missing EOF newlines
2020-11-18 17:50:38 -08:00
4dcb7a4a96
runtime fix
2020-11-14 17:36:13 +01:00
803bff4e5f
funny
2020-11-12 23:34:42 -07:00
fe3932a36e
Fixing the snore-pocalypse, and another not so critical issue.
2020-06-24 23:08:40 +02:00
08280a853e
Renames 'visible_atoms' and 'get_actual_viewers' procs to 'fov_view' and 'fov_viewers' ( #12282 )
...
* Renames 'visible_atoms' and 'get_actual_viewers' procs to 'fov_view' and 'fov_viewers'
* Ok, signals.
2020-05-17 17:04:15 -07:00
7c7147cb3e
Field of Vision component. ( #12075 )
...
* Hopeless WIP for vision cones.
* Core component and hooks done
* Removing clutter.
* linter bashing me for using statements as args.
* Ok.
* continue
* bring back the macro
* Configs and openspace filter.
* Chat plane, reset perspective signal, mechs/vehicles cases, machineries.
* view, viewers and spoopy ghosts.
* Renamed component, admin fun button and snowflakes robots.
* Whoopsie.
* Yikes
* test merge tweak.
* radial yaketi sax.
* Fixed tgui UIs, some messages not displayed to the target.
* Documentation and a little bugfix.
* Pulling QoL, seventh plane made in this PR.
* Fix.
* Tweaks and improvements.
* Update randomverbs.dm
2020-05-15 15:25:04 -07:00
8f29839dbf
Runechat Port ( #12065 )
...
* A
* A
* Ports Runechat
* compile fix
* fuck
* maybe?
* will this work?
* PLEASE
* fix
* fuck this
2020-05-03 03:53:19 +02:00
0e4692c63d
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-18 18:16:34 -07:00
c95bb9f8db
FUCK SHIT I'M NAKED IS THIS A DREAM OR REAL FUCK FUCK WHERE ARE MY CLOTHES hallucination ( #10857 )
...
* FUCK SHIT I'M NAKED IS THIS A DREAM OR REAL FUCK FUCK WHERE ARE MY CLOTHES????
* fix
* no more getflaticon dabdabdabdabdabdabdab
* tada
2020-02-16 07:31:30 +01:00
62ff589840
Something about a couple runtimes.
2020-02-12 09:10:24 +01:00
6a8a606f97
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-04 16:01:25 -07:00
0e13afc10f
yeet
2020-02-04 13:25:14 +08:00
4c2e702d7a
yee
2020-02-02 13:18:26 +08:00
f85527ab4b
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-01-19 16:18:12 -07:00
7bcb37c5d1
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-01-16 21:12:56 -07:00
9ef4cbfa76
refactor tags
2020-01-16 20:58:00 -07:00
14aaca8fa5
compile
2020-01-16 19:18:54 -07:00
c14439494a
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
2020-01-12 19:18:03 +01:00
16a37e2769
Standardises all files from CRLF to LF
2020-01-12 14:28:01 +00:00
7378d91684
([\W\.])Knockdown\(
2020-01-06 03:39:20 -08:00
BongaTheProto