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
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
d1b0e9ec9f
Merge remote-tracking branch 'upstream/master'
2024-03-01 21:15:28 -05:00
f5023d5700
push
2024-01-19 19:34:41 -03:00
0b990039e3
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2024-01-16 18:00:55 -03:00
c7a2565255
stop this nonsense
2024-01-05 00:28:56 -03:00
40f1d7401d
procs
2023-11-29 22:40:13 -03:00
6ada3f7c94
Merge remote-tracking branch 'upstream/master' into its-wasnt-gonna-happen
2022-04-18 21:36:14 -05:00
05349c27e9
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-04-15 23:43:43 -03:00
a4fac709c3
Merge remote-tracking branch 'upstream/master'
2022-04-09 11:43:45 -05:00
ada0ea7f32
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-04-09 02:40:23 -03:00
695835fcd6
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload)
2022-04-09 00:03:13 -03:00
586a035132
Update files
2022-04-06 18:41:31 -03:00
189716314f
Would you like some defines in these trying times?
2022-03-23 12:10:02 -03:00
988e0b1157
Adds an admin warning when a new player touched a circuit printer
2022-02-02 20:14:01 +00:00
e8c8d2b0ef
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-01-25 11:38:07 -03:00
21904d07e1
Kills off the weird new access system for circuitry, give em passkeys. ( #192 )
...
* Upload files
* Update access.dm
2021-11-09 11:48:16 -03:00
f1f6ac0109
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-10-31 22:14:23 -03:00
a057139c33
Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch
2021-10-30 11:54:20 +08:00
99019166e4
i think it works
...
MAJOR antag backend update
- you cannot bruteforce the pen anymore
- uplink now uses bitflag to lock purchases
- poplock is handled entirely by the buyable uplink items
- tgui antag intro (for selected ones)
2021-10-30 11:45:50 +08:00
bcdf96f274
Revert "TGUI alerts, lists, inputs"
2021-10-28 12:17:29 +08:00
32a6e63698
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-10-27 23:11:54 -03:00
45ef0fe5ca
closes #15278
2021-10-17 21:40:39 -03:00
17986fea3f
cannot escape
2021-10-16 14:24:22 -03:00
5aa12b4716
There's a bounty for this right? i spent nearly two full days at this
2021-10-05 18:10:32 -03:00
c3658b8f0e
Adds infoboxes ( #178 )
2021-08-14 00:16:39 -03:00
98e11d88a9
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-02-21 23:29:09 -03:00
123de14009
upload files
2021-02-18 15:05:39 -03:00
f738023097
Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing"
...
This reverts commit 2e29f30fdf724910cfab
2021-02-18 15:04:46 -03:00
cf2e70671a
upload files
2021-02-18 14:47:10 -03:00
e0efc2e85d
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-01-26 03:08:43 -03:00
6fb5067da4
upload files
2021-01-25 19:40:35 -03:00
0d1a6c73fc
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-01-19 23:31:15 -03:00
abd94d1c03
Merge remote-tracking branch 'origin/master' into semi-sync
2020-12-21 21:19:06 +08:00
a808f805d4
ASYNC EVERYTHING!
2020-12-21 16:24:51 +08:00
66ebcce860
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2020-12-19 01:07:54 -03:00
2aaddc2ee4
Update helpers.dm
2020-12-18 01:53:53 +00:00
4a30064a2c
Update saved_circuits.dm
2020-12-15 14:09:44 -07:00
4d6f2118c8
Update saved_circuits.dm
2020-12-15 13:32:27 -07:00
af0f6e7bd0
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2020-11-18 23:12:54 -03:00
803bff4e5f
funny
2020-11-12 23:34:42 -07:00
b28fce9ebb
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2020-10-28 13:36:59 -03:00
3d2bd4a98e
Revert "removes dildo"
2020-10-25 12:55:04 +08:00
e4f7092490
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
2020-08-05 22:52:22 -03:00
e71c397e29
bye
2020-08-01 16:55:39 -04:00
935901593b
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
2020-07-29 09:52:32 -03:00
7d7f40ce90
fixes
2020-07-26 14:56:03 -07:00
a5ef1123ca
New Circuitry Menu #27
2020-07-22 15:36:59 -03:00
98d3ac80d9
:pika:
2020-07-20 11:25:17 -07:00
BongaTheProto