SandPoot and GitHub
ef1e5bae16
Adds a command for admins to easily end the shift (calls shuttle) + misc stuff ( #222 )
2022-01-30 21:09:11 -03:00
BongaTheProto
9ce527e068
Merge remote-tracking branch 'upstream/master'
2022-01-26 00:20:29 -05:00
SandPoot
e8c8d2b0ef
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-01-25 11:38:07 -03:00
BongaTheProto and GitHub
a09909aa13
Merge pull request #140 from NullFag/khajitness
...
adds pacification bans
2022-01-19 02:50:16 -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
973ed1824c
fix
...
fix
2022-01-11 13:46:40 -05:00
LetterN
18b7069f1f
Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch
2022-01-11 09:49:38 +08:00
BongaTheProto
6b6194fe24
Merge remote-tracking branch 'upstream/master'
2022-01-10 18:15:30 -05:00
SandPoot
086e3bc704
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-01-09 23:40:45 -03:00
silicons and GitHub
4de727ce6e
Update SDQL_2.dm ( #15462 )
2022-01-09 16:59:29 +01:00
BongaTheProto
61704cba70
Verbs ready
...
these are the base verbs
2022-01-06 18:56:03 -05:00
BongaTheProto
228156d4be
Merge branch 'master' into tg-redbot-integration
2022-01-05 11:59:27 -05:00
BongaTheProto
91a6b73ae1
yeah
...
name's cringe but that's literally what it is lol
2022-01-05 04:09:12 -05:00
James
a67efdc1fa
TGUI Playtimes Panel
2022-01-05 05:22:53 +00:00
BongaTheProto
545dba4338
Merge remote-tracking branch 'upstream/master'
2022-01-02 19:50:02 -05:00
SandPoot
9694d84e14
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-01-02 20:56:15 -03:00
BongaTheProto
fc7c58013b
more hyper stuff
...
- added some hilberts to places
- fixed engineer boxes
- added hyper's punishments
- lightning punishment is funnier now
- added rounded noises from hyper
2022-01-02 02:06:35 -05:00
DeltaFire
2940d141cf
please-dont-smite-us-lummox
2022-01-01 07:10:35 +01:00
BongaTheProto
9a76d328c4
Merge remote-tracking branch 'upstream/master'
2021-12-31 21:17:10 -05:00
SandPoot
9a633b5395
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-12-31 14:07:43 -03:00
SandPoot and GitHub
8510dcc08a
Ports tgui stripping (finally) ( #15401 )
...
* Upload files
* Update items.dm
* Update files
* Update files
* Update strippable.dm
* Update strippable
* Update strippable.dm
* Upload files
* Update files
* Update files
* Update files
* update files
* Update files
* Update dog.dm
* Update strippable.dm
* Update equipping
* Update strippable.d
* Upload files
* Upload files
* Update monkey.dm
2021-12-30 07:40:15 +01:00
BongaTheProto
1fd1ae3771
no more clown I hate clown
...
I'll remove the clown job and anything clown related later I swear
2021-12-24 15:13:22 -05:00
keronshb
83a62ace04
Ambitioncheck
2021-12-23 21:15:31 -05:00
Putnam3145
657b25b501
i forgot i didn't add ammonia yet
2021-12-08 18:05:19 -08:00
Putnam3145
629ce5bea6
Station traits
2021-12-08 16:17:35 -08:00
BongaTheProto
0097fcc926
lil module
2021-12-05 15:48:04 -05:00
James
55a93074fa
Cleanup
2021-12-05 20:22:34 +00:00
James
f127ee299f
Corrects team size
2021-12-05 20:19:50 +00:00
James
2f85224b04
Cleanup and radio announcements
2021-12-05 14:12:39 +00:00
James
738e009078
Adds WIP shuttle / hideout. Adds teleport implant. More slave stuff.
2021-12-04 06:02:40 +00:00
James
f3726aba32
Added slave collars, slave console and modified comms console
2021-12-02 17:01:23 +00:00
BongaTheProto
2087ed552f
Fixed ahelp exploit + ported some emotes
...
You should no longer be able to send formatted html in ahelps, this means no more images for now, sadly.
- added speen
- added cackle
- moved all extra emotes to one file
2021-11-26 22:49:54 -05:00
LetterN
a47a20235f
make possess respect the new audio scheme
2021-11-22 14:20:26 +08:00
LetterN
8dcfea5817
Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch
2021-11-21 10:34:14 +08:00
SandPoot
34900425aa
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-11-17 13:48:32 -03:00
DeltaFire
6aa906395c
not a gaius reference
...
hhhh let me just replace all the ex_acts missing some args and adjust them
2021-11-14 21:34:59 +01: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
3da59fc38c
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-11-05 14:27:17 -03:00
keronshb
9153115566
Merge remote-tracking branch 'upstream/master' into familyport
2021-11-05 10:50:08 -04: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
keronshb
8978ee10fe
Merge remote-tracking branch 'upstream/master' into familyport
2021-10-28 14:41:46 -04:00
keronshb
c80d65df73
Merge branch 'master' into familyport
2021-10-28 14:34:20 -04: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
67c6cc3fc0
tiny fix
2021-10-27 13:48:34 -03:00
SandPoot
63b34c0712
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-10-19 14:21:07 -03:00
