BongaTheProto
dc057a41ad
Merge branch 'master' into upstream-merge
2024-04-06 18:51:51 -05:00
Elizabeth Lavenza
9befbb33b3
Fix runtime with plant harvester circuit
2024-04-01 19:25:42 -04:00
BongaTheProto
327ea3999f
Merge branch 'master' into 515-auxmos
2024-03-31 21:32:01 -05:00
Elizabeth Lavenza
bbcc0920ea
Fix blood causing harddels.
2024-03-29 17:22:50 -04:00
BongaTheProto
d20caf7191
Merge branch '515-update' into upstream-merge
2024-03-24 17:39:24 -05:00
BongaTheProto
b2e14a5393
Merge remote-tracking branch 'upstream/master' into upstream-merge
2024-03-24 17:02:38 -05:00
SandPoot
b76127c2d7
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2024-03-15 19:21:39 -03:00
BongaTheProto
1883c47d5c
basic ref regex
...
makes the proc calls compatible with 515
2024-03-11 19:46:05 -05: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
2579e590f9
in -> out (don't trust original code ever)
2024-01-21 00:32:39 -03:00
SandPoot
f5023d5700
push
2024-01-19 19:34:41 -03:00
SandPoot
0b990039e3
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2024-01-16 18:00:55 -03:00
BongaTheProto and GitHub
116c048d9c
Merge branch 'Sandstorm-Station:master' into master
2024-01-09 17:50:17 -05:00
SandPoot
6183d05fd5
fix camera circuit
2024-01-09 16:34:33 -03:00
SandPoot
c7a2565255
stop this nonsense
2024-01-05 00:28:56 -03:00
BongaTheProto
c1c9fef224
Merge remote-tracking branch 'upstream/master'
2023-12-15 18:12:47 -05:00
SandPoot
36f3edaf4c
push
2023-12-10 15:16:51 -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
6ada3f7c94
Merge remote-tracking branch 'upstream/master' into its-wasnt-gonna-happen
2022-04-18 21:36:14 -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
BongaTheProto
a4fac709c3
Merge remote-tracking branch 'upstream/master'
2022-04-09 11:43:45 -05:00
SandPoot
ada0ea7f32
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-04-09 02:40:23 -03:00
SandPoot
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
SandPoot
586a035132
Update files
2022-04-06 18:41:31 -03:00
SandPoot
189716314f
Would you like some defines in these trying times?
2022-03-23 12:10:02 -03:00
BongaTheProto
7af61efa52
Merge remote-tracking branch 'upstream/master'
2022-03-10 20:30:08 -05:00
SandPoot
7a2cc5ddfa
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-03-10 22:03:11 -03:00
SandPoot
21b68944e7
Upload files
2022-03-05 16:00:12 -03:00
James
988e0b1157
Adds an admin warning when a new player touched a circuit printer
2022-02-02 20:14:01 +00:00
SandPoot
e8c8d2b0ef
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-01-25 11:38:07 -03:00
SandPoot and GitHub
be30713a2a
Fixes circuit harvesting ( #198 )
2021-11-19 19:20:19 -03:00
LetterN
8b16653744
Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch
2021-11-12 08:50:23 +08:00
SandPoot and GitHub
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
SandPoot
3da59fc38c
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-11-05 14:27:17 -03:00
SandPoot
f1f6ac0109
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-10-31 22:14:23 -03:00
silicons
186b552103
merge
2021-10-29 21:50:58 -07:00
LetterN
a057139c33
Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch
2021-10-30 11:54:20 +08:00
LetterN
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
Letter N and GitHub
bcdf96f274
Revert "TGUI alerts, lists, inputs"
2021-10-28 12:17:29 +08:00
SandPoot
32a6e63698
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-10-27 23:11:54 -03:00
SandPoot
45ef0fe5ca
closes #15278
2021-10-17 21:40:39 -03:00
SandPoot
17986fea3f
cannot escape
2021-10-16 14:24:22 -03:00
SandPoot
5aa12b4716
There's a bounty for this right? i spent nearly two full days at this
2021-10-05 18:10:32 -03:00
SandPoot
e7d5275a70
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-09-20 14:32:29 -03:00
timothyteakettle
c506289e6f
removes remaining references
2021-09-18 14:24:20 +01:00
timothyteakettle
366bab9dbf
removes the passkey
2021-09-18 10:47:50 +01:00
Timothy Teakettle
d1dd46238a
Update access.dm
2021-09-16 15:30:39 +01:00
BongaTheProto