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
James
a67efdc1fa
TGUI Playtimes Panel
2022-01-05 05:22:53 +00: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
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
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
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
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
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
SandPoot
1561138350
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tgui-alerts-and-what-not
2021-10-16 14:11:00 -03:00
Lin and GitHub
1f7e65ad01
Merge pull request #15271 from Citadel-Station-13/admin_tickets
...
fixes "answered by <admin>" spam in irc
2021-10-15 23:34:15 -07:00
SandPoot
a797436f45
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-10-15 15:03:21 -03:00
silicons
d0eade8fe1
fix
2021-10-14 19:20:32 -07:00
DeltaFire
5680b74294
safety
2021-10-11 20:32:00 +02:00
DeltaFire
66e81e7fda
asay ping time
2021-10-11 19:52:30 +02:00
SandPoot
d55d628efe
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-10-08 21:34:03 -03: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
silicons
0a75925df9
wack
2021-09-29 06:02:17 -07:00
SandPoot
e7d5275a70
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-09-20 14:32:29 -03:00
zerothebigboy
06181f51ae
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
...
# Conflicts:
# code/modules/ninja/suit/suit.dm
2021-08-19 21:55:22 -04:00
SandPoot
d863f9f437
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-06-27 15:54:58 -03:00
Putnam
833d34ba8e
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos
2021-06-11 16:28:12 -07:00
SandPoot
91fd04c552
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-06-10 23:41:21 -03:00
Putnam
3b25f3e199
Started expanding auxgm a bit
2021-06-10 04:40:23 -07:00
zerothebigboy
1a90c96e4b
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
...
# Conflicts:
# icons/mob/clothing/feet.dmi
# icons/mob/clothing/feet_digi.dmi
# icons/mob/clothing/head.dmi
# icons/mob/clothing/mask.dmi
# icons/mob/clothing/mask_muzzled.dmi
# icons/obj/clothing/hats.dmi
# icons/obj/clothing/masks.dmi
# icons/obj/items_and_weapons.dmi
2021-06-09 17:40:28 -04:00
Putnam
86177c51c4
auxgm part 1
...
see also https://github.com/Baystation12/Baystation12/blob/dev/code/modules/xgm/xgm_gas_data.dm
2021-06-08 09:54:28 -07:00
keronshb
8f1db2d5ec
Fixes some stuff
...
Actually ticks the spell, fixes the brain damage issue, etc.
2021-05-27 12:16:54 -04:00
keronshb
78db6bd5c2
Ports Floor Cluwnes
...
Oh fuck oh god
2021-05-26 21:58:35 -04:00
zerothebigboy
bd186d25cf
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
2021-05-23 15:29:20 -04:00
SandPoot
3da0687e30
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-05-21 16:16:45 -03:00
silicons and GitHub
780a579c7b
Update SDQL_2_wrappers.dm
2021-05-17 12:20:15 -07:00
SandPoot
0313149d1c
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-05-08 02:43:01 -03:00
Putnam
6c8fa56132
Adds make priority announcement verb
2021-05-06 15:10:36 -07:00
BongaTheProto