Lin
357f266e30
Merge pull request #15774 from deathride58/firewallfix
...
[S] fixes small fail2topic vulnerability
2022-08-16 21:02:10 +00:00
Putnam3145
c6cf921e7a
Makes station trait on round start work
2022-08-14 23:29:40 -07:00
deathride58
2f4a095363
blacklists rule_name varedits
2022-08-09 18:40:02 -04:00
deathride58
f7ae896aeb
fixes small fail2topic vulnerability
2022-08-09 18:22:02 -04:00
Putnam3145
b2d816b825
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits
2022-08-07 17:59:28 -07:00
Hatterhat
2155a8bdce
funny ammo
2022-08-03 06:11:04 -05:00
deathride58
fc74dd8a69
maps, filenames, and DME
2022-07-20 17:19:27 -04: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
deathride58
4ea1a44e85
fixes jukebox audio not coming through containers
2022-06-11 00:48:35 -04:00
Lin
0429ff2b99
Merge pull request #15658 from deathride58/admindeobfuscationfix
...
Fixes a bug in admin vote deobfuscation
2022-06-07 05:42:36 +00:00
deathride58
e75c413d42
Merge pull request #15652 from SandPoot/title-screen
...
Updates the title screen
2022-06-05 00:27:44 -04:00
deathride58
76144282c9
fixes admin vote deobfuscation - options that were never voted for now properly display as 0
2022-06-01 23:07:08 -04:00
Lin
becb035529
Merge pull request #15632 from deathride58/botrefresh
...
Bot refresh - Makes bot output channels configurable, makes the bot capable of pinging the reboot role
2022-06-01 21:18:10 +00:00
Lin
37cd25109e
Merge pull request #15634 from deathride58/jukeboxrefresh
...
Jukebox refresh - Jukebox queue, working volume knob, emagging, preliminary multiz support, and more!
2022-06-01 21:18:02 +00:00
deathride58
f34e268a1c
Merge pull request #15636 from Putnam3145/approval-for-transfer
...
Switches transfer vote to approval voting
2022-05-30 21:53:56 -04:00
SandPoot
688fac740a
icons/runtime?
2022-05-30 02:07:49 -03:00
SandPoot
8bb1c2b32a
Upload files
2022-05-30 01:31:54 -03:00
deathride58
d2466e5ac3
Inlines the bulk of playsound_local, fixing several jukebox audio bugs in one fell swoop
2022-05-25 20:41:32 -04:00
deathride58
e577995c69
Merge pull request #15231 from Tupinambis/Assistantagging
...
Antag roles will now respect your backup role preferences if none of the enabled roles are available
2022-05-24 14:48:34 -04:00
Putnam3145
16137c31eb
Switches transfer vote to approval voting
2022-05-21 22:07:25 -07:00
deathride58
b34cfa6485
free speed, fwee! - caches a sound for each playing jukebox to avoid datum creation overhead every fire
2022-05-22 00:53:52 -04:00
deathride58
ccc5c6cf75
small warning to all future code divers
2022-05-21 21:26:52 -04:00
deathride58
087602711f
makes SOUND_MUTE actually FUCKING WORK when deaf. thanks azarak for helping with debugging!
2022-05-21 20:48:37 -04:00
deathride58
5d648fcf6a
makes jukeboxes deal hearing loss when too loud, makes being deaf temporarily mute jukebox
2022-05-21 19:23:10 -04:00
deathride58
113981b5a8
Jukebox refresh - Jukebox queue, preliminary multiz support, working volume knob, and more!
2022-05-21 00:21:58 -04:00
deathride58
14d885093e
yknow lets just add a linebreak there it looks better with it
2022-05-19 15:32:48 -04:00
deathride58
ccc5ea1758
Bot refresh - Makes bot output channels configurable, makes the bot capable of pinging the reboot role
2022-05-19 15:19:21 -04:00
Putnam3145
33889870c9
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits
2022-05-17 13:22:40 -07:00
deathride58
40730237f2
Hub refresh - Cleans up update_status(), adds more hub-related config options, and more!
2022-05-05 14:52:53 -04:00
Putnam3145
e41f0461d9
Fixes the round time thing
2022-04-30 17:45:56 -07:00
silicons
73d39db3c1
Merge pull request #15343 from SandPoot/deadmin-prefs
...
Ports Automatic Deadminning from TG
2022-04-15 17:44:55 -07:00
SandPoot
2555843026
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload)
2022-04-09 03:06:56 -03:00
Lin
fd286c325e
Merge branch 'master' into Projectile_Rework
2022-04-09 04:19:56 +00:00
SandPoot
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
silicons
dee1db4a3a
Merge pull request #15558 from SandPoot/mechs-are-vehicles
...
/obj/mecha ➡ /obj/vehicle/sealed/mecha
2022-04-08 18:26:47 -07:00
silicons
904990a037
Merge pull request #15584 from Arturlang/StasisBeds
...
Stasis beds
2022-04-08 09:47:26 -07:00
Artur
2100133c4b
Neeewliiines
2022-04-07 14:34:19 +03:00
Artur
c20a847712
Apparently unnecesary
2022-04-07 14:28:38 +03:00
Solaris-Shade
48db01702b
Merge branch 'Citadel-Station-13:master' into Projectile_Rework
2022-04-06 22:31:51 -04:00
SandPoot
586a035132
Update files
2022-04-06 18:41:31 -03:00
silicons
c8cab13081
Merge pull request #15565 from SandPoot/custom-statues
...
Custom statues and sculpting changes.
2022-04-06 12:12:24 -07:00
Artur
c36019bf56
Adds stasis beds
2022-04-06 15:38:05 +03:00
Solaris-Shade
a70fb1fb43
Merge branch 'Citadel-Station-13:master' into Projectile_Rework
2022-03-31 15:29:31 -04:00
BlueWildrose
3687361ba5
Butts, nuts, n' tats. (please testmerge or merge & deploy before Halloween ball) ( #15304 )
...
* Butts
* testicle fix + hidden is back
* updated booba
* prob bad idea actually thinking about icon states
* fuck
* this should be everything now
* SandPoot's suggestion
Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com >
* tguify that last option
* Revert "tguify that last option"
This reverts commit f9d7a075e997e3d9c0a4f641db43343796cecb98.
* Revert "Merge branch 'master' into cursingcitadel"
This reverts commit 2998b1908a74b381857056f5ce6b34894d950c06, reversing
changes made to 6fc65a28fa4f6012c70675b4cbc0299d7740912a.
* Revert "Revert "Merge branch 'master' into cursingcitadel""
This reverts commit c4a2ad1a630b6376801df3e1cec88aad3d2935ea.
Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com >
Co-authored-by: Putnam3145 <putnam3145@gmail.com >
2022-03-30 20:06:00 -07:00
Putnam3145
6199aa4d60
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits
2022-03-30 12:35:12 -07:00
Putnam3145
b83cc194d4
Makes SSstation only fire if any traits process
2022-03-29 19:40:20 -07:00
SandPoot
205c9b3d43
Those are too early.
2022-03-23 12:21:29 -03:00
SandPoot
189716314f
Would you like some defines in these trying times?
2022-03-23 12:10:02 -03:00
SandPoot
e9637bb688
Merge branch 'master' into deadmin-prefs
2022-03-22 15:35:46 -03:00
Solaris-Shade
d9ff37d2ff
Merge branch 'Citadel-Station-13:master' into Projectile_Rework
2022-03-19 11:23:16 -04:00
