91a0b89c9f
Merge remote-tracking branch 'upstream/master'
2024-08-13 15:07:57 -05:00
bc0dc5ee02
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2024-08-12 19:54:43 -03:00
9c92081471
push
2024-07-06 01:11:49 -03:00
353e81e8ce
Merge remote-tracking branch 'upstream/master'
2024-05-29 17:56:50 -05:00
897f4e2914
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2024-05-22 21:08:11 -03:00
912ca1e374
poosh
2024-05-21 00:06:26 -03:00
dc057a41ad
Merge branch 'master' into upstream-merge
2024-04-06 18:51:51 -05:00
c2df4281b9
Merge branch 'master' of https://github.com/Sandstorm-Station/Sandstorm-Station-13 ; branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2024-04-05 23:31:50 -03:00
68fa21d602
content
2024-04-05 17:57:54 -03:00
9befbb33b3
Fix runtime with plant harvester circuit
2024-04-01 19:25:42 -04:00
327ea3999f
Merge branch 'master' into 515-auxmos
2024-03-31 21:32:01 -05:00
bbcc0920ea
Fix blood causing harddels.
2024-03-29 17:22:50 -04:00
d20caf7191
Merge branch '515-update' into upstream-merge
2024-03-24 17:39:24 -05: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
676cb864b1
missed proc refs
2024-03-12 22:17:30 -03:00
1883c47d5c
basic ref regex
...
makes the proc calls compatible with 515
2024-03-11 19:46:05 -05: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
2579e590f9
in -> out (don't trust original code ever)
2024-01-21 00:32:39 -03: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
116c048d9c
Merge branch 'Sandstorm-Station:master' into master
2024-01-09 17:50:17 -05:00
6183d05fd5
fix camera circuit
2024-01-09 16:34:33 -03:00
c7a2565255
stop this nonsense
2024-01-05 00:28:56 -03:00
c1c9fef224
Merge remote-tracking branch 'upstream/master'
2023-12-15 18:12:47 -05:00
36f3edaf4c
push
2023-12-10 15:16:51 -03:00
a558377206
more stuff i can't guarantee works by itself yet
2023-11-29 23:37:15 -03:00
40f1d7401d
procs
2023-11-29 22:40:13 -03:00
d4ec25e748
all else
2023-08-08 14:01:18 +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
7af61efa52
Merge remote-tracking branch 'upstream/master'
2022-03-10 20:30:08 -05:00
7a2cc5ddfa
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-03-10 22:03:11 -03:00
21b68944e7
Upload files
2022-03-05 16:00:12 -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
be30713a2a
Fixes circuit harvesting ( #198 )
2021-11-19 19:20:19 -03:00
8b16653744
Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch
2021-11-12 08:50:23 +08: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
3da59fc38c
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-11-05 14:27:17 -03:00
f1f6ac0109
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-10-31 22:14:23 -03:00
186b552103
merge
2021-10-29 21:50:58 -07: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
Mosley