19ee7f8bd2
some hints
2023-07-19 20:51:25 -03:00
32a36a1bfa
put back
2023-01-27 23:03:47 -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
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
f7b898a2a9
frontend
2021-10-28 17:34:52 +08:00
bcdf96f274
Revert "TGUI alerts, lists, inputs"
2021-10-28 12:17:29 +08: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
bbe32fa38a
Upload files
2021-10-05 00:33:49 -03:00
82ccfc40dc
/obj/screen --> /atom/movable/screen
2021-07-29 13:57:19 +03:00
c253a2de86
alright how about these
2021-06-21 09:52:54 -07:00
79c501a7b4
upload files
2021-06-09 21:36:43 -03:00
2381db5f53
upload files
2021-03-31 12:35:43 -03:00
228105b391
laptop and closet decon fix
2021-03-16 14:47:28 +08:00
754c24748e
Merge remote-tracking branch 'origin/master' into hardsync-1.5
2021-03-03 17:09:01 +08:00
bf6c574ea4
Makes tablets not permacontam.
2021-02-25 05:55:44 -08:00
45d6a5f87f
it compiles, UNTESTED YET
2021-02-13 21:41:59 +08:00
5b0a1077f4
Modular Cmp Updates
2021-02-12 18:29:00 +08:00
f04918bdca
working code?
2020-08-21 15:09:49 +08:00
8d70e21239
the unexpected paperwork update. paperwork rp? And also includes ntnet upgrade because fuck it.
2020-08-20 19:40:47 +08:00
f1c4a7f6ac
Merge remote-tracking branch 'origin/master' into TGUI-4
2020-08-09 14:54:16 +08:00
e9cbb550a1
Update laptop.dm
2020-08-06 18:09:50 -07:00
e40470f553
h. Updates NTOS, and axes p2p filetransfer!
2020-07-30 20:54:13 +08:00
b376a6b6c4
Merge remote-tracking branch 'origin/master' into TGUI-4
2020-07-30 14:43:52 +08:00
0805265412
yet another batch. MAJOR: APC
2020-07-30 12:54:53 +08:00
98d3ac80d9
:pika:
2020-07-20 11:25:17 -07:00
993b4ec222
Merge remote-tracking branch 'citadel/master' into unarmed_parry
2020-07-16 19:39:46 -07:00
6ee63f66aa
whew
2020-07-07 20:48:54 -07:00
80b47ec1c0
Ports https://github.com/tgstation/tgstation/pull/50497
2020-04-23 09:55:28 +03:00
230e5fca20
fix everything
2020-04-11 15:32:09 +08:00
d5a6c25128
Update tablet.dm
2020-03-11 13:19:57 +01:00
59b1a223a3
Ok, done.
2020-03-08 22:51:36 +01:00
ad20fb1a0e
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into contracties
2020-03-06 11:58:11 +01:00
ec3e2ddb24
no more laptop slowdown
2020-03-01 21:17:48 -05:00
e3c77f2f5a
part 4: the one where i slowly go insane
2020-03-01 22:05:35 +01:00
d93ade7e03
part 2: bloody tendency
2020-03-01 17:37:18 +01:00
38f7821dd6
part 1: battle stream
2020-03-01 16:56:13 +01:00
8fbfd07692
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
2020-02-22 00:55:32 +01:00
6cc6aa12be
yeehaw it's done
2020-02-05 16:54:57 +08:00
a726f09201
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
2020-02-04 03:54:52 +01:00
2393dc26eb
Merge pull request #10779 from Ghommie/Ghommie-cit538
...
added a second macro argument to STATION_TIME and STATION_TIME_TIMESTAMP.
2020-02-02 16:31:59 -07:00
95db5084ab
Screw commit history.
2020-02-02 01:26:04 +01:00
83ce84cdc4
Merge branch 'master' into TGUIs_Nexties
2020-01-30 20:46:20 +02:00
0dba1b5102
added a second macro argument to STATION_TIME and STATION_TIME_TIMESTAMP.
2020-01-30 02:17:02 +01:00
e45cc4933c
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into hijackbackup
2020-01-27 08:33:38 +08:00
a5404f6063
Merge pull request #10687 from Ghommie/Ghommie-cit523
...
A few more, ported, runtime fixes.
2020-01-25 05:54:03 -07:00
e360ac1d36
Conflict fix
2020-01-24 23:06:32 +01:00
721fd108f9
A few more, ported, runtime fixes.
2020-01-24 03:02:07 +01:00
SandPoot