BongaTheProto
700fd57efb
Merge remote-tracking branch 'upstream/master'
2023-12-08 20:22:05 -05:00
SandPoot
b290efc434
push
2023-11-22 14:11:17 -03:00
BongaTheProto
7146a5f2eb
Merge remote-tracking branch 'upstream/master'
2023-01-30 17:02:01 -05:00
silicons and GitHub
469ac02274
Merge pull request #15950 from SandPoot/trigger-events-tgui
...
Event menu rewrite
2023-01-29 13:46:39 -08:00
SandPoot
54641ce201
send
2023-01-23 20:44:28 -03:00
LetterN
d240eb5377
update mentor admin log sql query
2023-01-22 11:40:21 +08:00
Iosyf
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
BongaTheProto
811c1df810
Merge remote-tracking branch 'upstream/master'
2022-07-24 12:05:49 -05:00
deathride58
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
BongaTheProto
899f66ecc6
Merge branch 'master' into pr/214
2022-02-27 15:16:13 -05:00
BongaTheProto
54aec9bd98
Merge remote-tracking branch 'upstream/master'
2022-02-27 14:38:06 -05:00
SandPoot
fb7a24b333
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-02-27 14:17:53 -03:00
Lin and GitHub
ae5896d6cf
Merge pull request #15525 from keronshb/ambitioncheck
...
Ambitions from Skyrat
2022-02-27 02:34:13 +00:00
James
7932cd7b07
Cleanup 3
2022-02-26 09:59:54 +00:00
James
a5d37e701f
More cleanup
2022-02-26 09:07:58 +00:00
James
d55f509282
Cleanup
2022-02-26 06:42:19 +00:00
SandPoot
5029af901b
Upload files
2022-02-25 16:58:09 -03:00
keronshb
3ea22f97a6
Merge remote-tracking branch 'upstream/master' into ambitioncheck
2022-02-22 17:10:25 -05:00
James
ef610eb21c
WIP jobban panel
2022-02-20 18:40:00 +00:00
James
1038df6983
First page of panel basically done
2022-02-19 17:42:17 +00:00
BongaTheProto and GitHub
c8060ac1a2
Merge pull request #193 from Crowbar764/slaver-patch-4
...
Slaver Patch 4
2022-02-18 01:41:10 -05:00
BongaTheProto and GitHub
93016e7568
Merge branch 'Sandstorm-Station:master' into master
2022-02-16 16:03:32 -05:00
SandPoot
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
SandPoot
52a8fe276b
Update files
2022-02-15 18:27:33 -03:00
James
178b0ebef4
Adds option to recruit slaves
2022-02-15 13:27:59 +00:00
BongaTheProto
b437b03b48
Merge remote-tracking branch 'upstream/master'
2022-02-13 13:40:33 -05:00
keronshb
f1ca283318
Merge branch 'master' into familyport
2022-02-11 14:04:57 -05:00
BongaTheProto
5638985734
Merge branch 'ambitions' into pr/176
2022-02-06 20:27:38 -05:00
E
a1a14dc012
khajitness embraced
2022-01-18 23:44:48 +01:00
E
78cccddffc
grounds
2022-01-16 17:07:58 +01:00
BongaTheProto
545dba4338
Merge remote-tracking branch 'upstream/master'
2022-01-02 19:50:02 -05:00
DeltaFire
2940d141cf
please-dont-smite-us-lummox
2022-01-01 07:10:35 +01:00
keronshb
83a62ace04
Ambitioncheck
2021-12-23 21:15:31 -05:00
James
f3726aba32
Added slave collars, slave console and modified comms console
2021-12-02 17:01:23 +00:00
keronshb
9153115566
Merge remote-tracking branch 'upstream/master' into familyport
2021-11-05 10:50:08 -04:00
keronshb
8978ee10fe
Merge remote-tracking branch 'upstream/master' into familyport
2021-10-28 14:41:46 -04:00
Letter N and GitHub
bcdf96f274
Revert "TGUI alerts, lists, inputs"
2021-10-28 12:17:29 +08:00
SandPoot
45ef0fe5ca
closes #15278
2021-10-17 21:40:39 -03:00
keronshb
e2ab532de2
Removes old gangs, families is almost ready
2021-10-12 16:34:27 -04:00
SandPoot
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
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
bbe32fa38a
Upload files
2021-10-05 00:33:49 -03:00
keronshb
7ed5f622f4
Dynamic
2021-09-14 19:33:17 -04:00
LetterN
6739e349a0
heretics LOVES this - Also ian's birthday!
2021-09-08 09:50:07 +08:00
Fabian
63d910c79c
Merge branch 'master' into the-fuck-am-i-doing
2021-05-05 17:26:41 +02:00
silicons and GitHub
52a4a5a042
nothing to see here folks
2021-04-18 08:29:51 -07:00
silicons and GitHub
bb50a4f160
Update topic.dm
2021-04-17 16:21:33 -07:00
Fabian
7e50d878ca
Merge branch 'master' into the-fuck-am-i-doing
2021-03-15 14:09:30 +01:00
Fabian
8178b7073a
It's done, atleast the code is
2021-03-05 21:50:29 +01:00
Fabian
a061f02b5b
Revert "objectives"
...
This reverts commit dbabbb1062
2021-03-05 21:19:56 +01:00
BongaTheProto