0d9eebd20c
Merge remote-tracking branch 'upstream/master'
2025-04-24 17:03:15 -05:00
56d972eb0b
all sorts of fixes and updates, may break stuff
2025-02-09 02:09:28 -03:00
6e57a237a9
[MIRROR] Popup Notice tgstation/tgstation#61010
...
Ports the admin popup notice from tgstation.
2024-10-07 23:27:22 -03:00
d1b0e9ec9f
Merge remote-tracking branch 'upstream/master'
2024-03-01 21:15:28 -05:00
c7a2565255
stop this nonsense
2024-01-05 00:28:56 -03:00
13cd269788
Merge remote-tracking branch 'upstream/master'
2023-12-25 14:28:51 -05:00
7b62dbe7bb
ai + mech
2023-12-17 23:15:59 -03:00
700fd57efb
Merge remote-tracking branch 'upstream/master'
2023-12-08 20:22:05 -05:00
b290efc434
push
2023-11-22 14:11:17 -03:00
7146a5f2eb
Merge remote-tracking branch 'upstream/master'
2023-01-30 17:02:01 -05:00
469ac02274
Merge pull request #15950 from SandPoot/trigger-events-tgui
...
Event menu rewrite
2023-01-29 13:46:39 -08:00
54641ce201
send
2023-01-23 20:44:28 -03:00
d240eb5377
update mentor admin log sql query
2023-01-22 11:40:21 +08:00
fda19d3d11
Qareen Almost Completion
...
- Added the Qareen to the spawnable antagonists list
- Finished modifications to the "Bliss", "Harvest" and "Malfunction" abilities
- All that's left now is the manifestation (but I couldn't find any spriters for it so...)
- Probably needs to be balanced
2022-09-28 21:19:28 +03:00
811c1df810
Merge remote-tracking branch 'upstream/master'
2022-07-24 12:05:49 -05:00
578eb440c1
If you know, you know; fixes a decade-old typo, essentially mirroring RP's typo fix
2022-07-20 16:51:38 -04:00
899f66ecc6
Merge branch 'master' into pr/214
2022-02-27 15:16:13 -05:00
54aec9bd98
Merge remote-tracking branch 'upstream/master'
2022-02-27 14:38:06 -05:00
fb7a24b333
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-02-27 14:17:53 -03:00
ae5896d6cf
Merge pull request #15525 from keronshb/ambitioncheck
...
Ambitions from Skyrat
2022-02-27 02:34:13 +00:00
7932cd7b07
Cleanup 3
2022-02-26 09:59:54 +00:00
a5d37e701f
More cleanup
2022-02-26 09:07:58 +00:00
d55f509282
Cleanup
2022-02-26 06:42:19 +00:00
5029af901b
Upload files
2022-02-25 16:58:09 -03:00
3ea22f97a6
Merge remote-tracking branch 'upstream/master' into ambitioncheck
2022-02-22 17:10:25 -05:00
ef610eb21c
WIP jobban panel
2022-02-20 18:40:00 +00:00
1038df6983
First page of panel basically done
2022-02-19 17:42:17 +00:00
c8060ac1a2
Merge pull request #193 from Crowbar764/slaver-patch-4
...
Slaver Patch 4
2022-02-18 01:41:10 -05:00
93016e7568
Merge branch 'Sandstorm-Station:master' into master
2022-02-16 16:03:32 -05:00
a3d9dd2c99
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into job-exp-exemption
2022-02-15 18:35:23 -03:00
52a8fe276b
Update files
2022-02-15 18:27:33 -03:00
178b0ebef4
Adds option to recruit slaves
2022-02-15 13:27:59 +00:00
b437b03b48
Merge remote-tracking branch 'upstream/master'
2022-02-13 13:40:33 -05:00
f1ca283318
Merge branch 'master' into familyport
2022-02-11 14:04:57 -05:00
5638985734
Merge branch 'ambitions' into pr/176
2022-02-06 20:27:38 -05:00
a1a14dc012
khajitness embraced
2022-01-18 23:44:48 +01:00
78cccddffc
grounds
2022-01-16 17:07:58 +01:00
545dba4338
Merge remote-tracking branch 'upstream/master'
2022-01-02 19:50:02 -05:00
2940d141cf
please-dont-smite-us-lummox
2022-01-01 07:10:35 +01:00
83a62ace04
Ambitioncheck
2021-12-23 21:15:31 -05:00
f3726aba32
Added slave collars, slave console and modified comms console
2021-12-02 17:01:23 +00:00
9153115566
Merge remote-tracking branch 'upstream/master' into familyport
2021-11-05 10:50:08 -04:00
8978ee10fe
Merge remote-tracking branch 'upstream/master' into familyport
2021-10-28 14:41:46 -04:00
bcdf96f274
Revert "TGUI alerts, lists, inputs"
2021-10-28 12:17:29 +08:00
45ef0fe5ca
closes #15278
2021-10-17 21:40:39 -03:00
e2ab532de2
Removes old gangs, families is almost ready
2021-10-12 16:34:27 -04:00
437b3105d1
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tgui-alerts-and-what-not
2021-10-08 21:05:41 -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
bbe32fa38a
Upload files
2021-10-05 00:33:49 -03:00
7ed5f622f4
Dynamic
2021-09-14 19:33:17 -04:00
Mosley