Commit Graph

42 Commits

Author SHA1 Message Date
BongaTheProto
acf6b87535 Merge remote-tracking branch 'upstream/master' 2023-02-24 01:39:26 -05:00
SandPoot
f0dcf824a7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-02-24 01:59:45 -03:00
SandPoot
d287fc25ca poosh 2023-02-21 01:55:49 -03:00
BongaTheProto
620380e188 Merge remote-tracking branch 'upstream/master' 2023-01-21 13:15:29 -05:00
SandPoot
54192d4d0d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-01-20 21:35:34 -03:00
SandPoot
0ebcf0b72f stuff 2023-01-16 18:16:32 -03:00
BongaTheProto
6d385f2b2e Merge remote-tracking branch 'upstream/master' 2022-06-07 19:10:13 -05:00
SandPoot
be1357bdb0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-06-07 17:29:38 -03:00
deathride58
09bdf4310a extra cleanup 2022-05-31 19:40:38 -04:00
deathride58
1a918ed8db animation refresh - huge unatomized bundle of fixes and tweaks to numerous animations in the game 2022-05-31 19:22:30 -04:00
BongaTheProto
a1a3b3fc93 Merge remote-tracking branch 'upstream/master' 2022-03-20 21:24:52 -05:00
SandPoot
e64a988cda Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-03-20 19:49:11 -03:00
SandPoot
3ee2d12b34 Upload files 2022-03-18 12:45:07 -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
8ca82f375d Merge branch 'Sandstorm-Station:master' into master 2022-01-12 16:56:25 -05:00
SandPoot
0031ee81db Updates runechat adding languages to it (#219) 2022-01-12 17:13:48 -03:00
LetterN
fab4b07be5 Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2021-12-21 07:59:33 +08:00
BongaTheProto
49f874311d Merge remote-tracking branch 'upstream/master' 2021-12-10 13:58:31 -05:00
SandPoot
e21a8445e2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-12-10 14:53:39 -03:00
SandPoot
30426ad011 Upload chatmessage.dm 2021-12-08 23:36:42 -03:00
E
0592520bea fixes runtimes 2021-12-06 20:36:46 +01: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
LetterN
f7b898a2a9 frontend 2021-10-28 17:34:52 +08:00
SandPoot
91fd04c552 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-06-10 23:41:21 -03:00
SandPoot
b0940456f5 upload files 2021-06-08 13:13:22 -03:00
Maksxpl
c8082e1009 Compliance with standards (#134)
* enjoy

* Update shuttles.dm

sowwy

Co-authored-by: Maksxpl <18237380+maksxpl@users.noreply.github.com>
2021-01-19 12:44:08 -03:00
SandPoot
7de5a17cdf quick fix 2021-01-11 16:21:42 -03:00
SandPoot
ad4ca5fc30 Fixes runechat (#130) 2021-01-11 16:07:34 -03:00
SandPoot
273ad286d5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-10-10 14:43:38 -03:00
silicons
19f1e99a8c mass ports like 15 tg prs + counting (#13386)
* changes

* ok

* changes

* sigh

* fixes

* changes

* fix

* fix

* alright

* fixes
git pus

* fix

* fix

* fix

* test

* ok

* Update code/modules/paperwork/ticketmachine.dm

Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>

* ok

* compile and other stuff

* ok

* fix

* fix

* Fix

* Update menu.dm

* Update view.dm

* Update preferences.dm

Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
2020-10-10 12:20:33 +02:00
SandPoot
6050278fa6 Revert "Runechat fix (#68)" (#76)
This reverts commit 0666837193.
2020-09-25 20:55:26 -03:00
SandPoot
0666837193 Runechat fix (#68) 2020-09-15 19:20:29 -03:00
SandPoot
bcb474627b Bluespace miner update + a little fix for borgdrakes* (#52) 2020-08-20 17:53:37 -03:00
Enric Gabriel
d312fbc4db Mining update (#30)
* smol mining update

* Revert "smol mining update"

This reverts commit 9a0bd466ff4dad2cd5c4840fa7a80d5243317e18.

* the .wav files i will use

* the rest that is being added for now

* fixes your stuff

* makes the crusher purchasable

* fixes legion's trophy

* so many icons and oggs

* SIF and more icons

* even more icons, sorry

* new modkits, yay

* oh come on, it didn't update

* some bosses seen to be ready

* Glory Kill system, should work just fine

* even more icons, jeez, also, elite mods

* oh hey, i got the icon

* almost done

* icons and meme dragon

* it's icon was hidden and i didn't notice

* why do i hear boss music ?

* one day...

* while Nano was...

* not continuing that

* stole some compatibility stuff

* the end is near

* some stuff to make stuff work

* probably one of the last commits

* king goat itself

* THE ERRORS, THEY'RE EVERYWHERE

* so close...

* the new ruins should spawn now

* should be the last commit, let's test it

* Now The Gladiator actually exists

* make them mad, and toggle their music

* oh, wait, need to give you the new files

* i think i saved someone's ears

* missing areas, i'm sorry

* good luck fighting KG without a ladder

* just leave a comment, nothing else

* fixes double spawn at least for hiero, aka why the fuck make two of the same proc and not remove 1st

* invisible hat, not anymore

* takes some stuff before bob even merges it on theirs

* how did these icons disappear ?

* fixes some oopsies

* sand plz help

* *fixes your thing*

* and i think i fixed the other

* fixes

* no async needed

* im done, just merge this useless thing

Co-authored-by: crazyraio2 <44246096+crazyraio2@users.noreply.github.com>
2020-07-25 20:04:07 -03:00
Enric Gabriel
ba3da94e74 fix some positioning stuff + revert forced _indicator on some binds 2020-07-24 00:08:08 -03:00
Enric Gabriel
e3eb8b0b02 few fixes 2020-07-13 00:58:06 -03:00
Enric Gabriel
961a217691 holy shit, there's so much stuff here, so... idk exactly what it does 2020-07-04 21:39:32 -03:00
kevinz000
a4a0295312 ok 2020-06-07 21:27:36 -07:00
Ghom
73a27c8fe5 Porting "Fixes Null Reference + Qdel Issue in Runechat" (#12271) 2020-05-16 07:38:16 -07:00
Ghom
7c7147cb3e Field of Vision component. (#12075)
* Hopeless WIP for vision cones.

* Core component and hooks done

* Removing clutter.

* linter bashing me for using statements as args.

* Ok.

* continue

* bring back the macro

* Configs and openspace filter.

* Chat plane, reset perspective signal, mechs/vehicles cases, machineries.

* view, viewers and spoopy ghosts.

* Renamed component, admin fun button and snowflakes robots.

* Whoopsie.

* Yikes

* test merge tweak.

* radial yaketi sax.

* Fixed tgui UIs, some messages not displayed to the target.

* Documentation and a little bugfix.

* Pulling QoL, seventh plane made in this PR.

* Fix.

* Tweaks and improvements.

* Update randomverbs.dm
2020-05-15 15:25:04 -07:00
kevinz000
8f29839dbf Runechat Port (#12065)
* A

* A

* Ports Runechat

* compile fix

* fuck

* maybe?

* will this work?

* PLEASE

* fix

* fuck this
2020-05-03 03:53:19 +02:00