189 Commits

Author SHA1 Message Date
Metis 4bd63db80f Merge remote-tracking branch 'upstream/master' 2024-11-17 16:55:40 -05:00
Metis f6af059a06 job titles 2024-11-02 03:16:16 -04:00
evilew d1d52f013b changing some icosn
- added approaching GS13 sound
- moved over Hyper's xeno queen sprites
- moved over wooden chair sprites
2024-10-23 13:48:18 +02:00
SandPoot ad0f659226 push 2024-05-23 21:53:15 -03:00
SandPoot 68fa21d602 content 2024-04-05 17:57:54 -03:00
SandPoot c7a2565255 stop this nonsense 2024-01-05 00:28:56 -03:00
SandPoot 297ee64977 push 2023-10-12 15:45:35 -03:00
SandPoot 6ab934f6a1 pushies 2023-07-19 15:06:23 -03:00
Darius 3adcab1756 Display job slots out of total during late-join
Changes late join text from "Job (current)" to "Job (current/limit)" to prevent confusion. Infinite-slot jobs display an infinity symbol.
2023-01-04 19:15:09 -05:00
Lin 03c62f4359 Merge pull request #15876 from SandPoot/fix-deadchat_broadcast
Fixes deadchat_broadcast
2022-10-25 04:36:00 +00:00
SandPoot 24ee6077c7 push changes 2022-10-23 00:18:03 -03: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
deathride58 c5e0048efd oops - forgot to completely undo the de-fanging i did for testing! 2022-05-30 22:10:37 -04:00
deathride58 ee92230176 Moves newplayer button population to a dedicated proc, significantly reducing the hackiness involved for getting the agegate working proper 2022-05-30 22:08:49 -04:00
SandPoot 8bb1c2b32a Upload files 2022-05-30 01:31:54 -03: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
SandPoot 586a035132 Update files 2022-04-06 18:41:31 -03: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
keronshb f1ca283318 Merge branch 'master' into familyport 2022-02-11 14:04:57 -05:00
silicons af6e43c595 refactors clickcatchers/parallax/fullsceren (#15460)
* :)

* that

* move those there

* refactor that too

* wew

* stuff

* almost.

* sigh

* just need speed

* stuf

* pain

* hm

* tweaks

* that

* eh

* wack

* a

* done

* that's important

* wacky

* all that

* fixes

* typo

* that

* a

* funny

* that

* that

* woo

* help im losing my fucking mind

* okay

* fix
2022-02-07 15:17:24 -08:00
Putnam3145 629ce5bea6 Station traits 2021-12-08 16:17:35 -08: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 bcdf96f274 Revert "TGUI alerts, lists, inputs" 2021-10-28 12:17:29 +08:00
keronshb 1427157df3 Fixes space cops and adds config for dynamic 2021-10-15 00:12:46 -04:00
keronshb bf7cd77096 Fixes a few things 2021-10-13 23:25:01 -04:00
keronshb 41013ec815 Part 2 - Missing stuff from original families port 2021-10-12 12:07:02 -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 c9697f4bbf Fixes dynamic 2021-09-23 19:38:15 -04:00
Artur 82ccfc40dc /obj/screen --> /atom/movable/screen 2021-07-29 13:57:19 +03:00
Letter N 09ce499146 aeiou 2021-03-01 21:55:34 +08:00
Letter N 6abad913ff the sqel 2021-02-19 14:52:18 +08:00
Letter N 7d39949a2f Merge remote-tracking branch 'origin/master' into rustsql 2021-02-19 12:38:32 +08:00
timothyteakettle b2588c5d57 Update new_player.dm 2021-02-14 02:11:07 +00:00
Letter N 6e060b13f5 all done 2021-01-02 20:17:19 +08:00
DeltaFire d3f30d21cf Merge pull request #13772 from silicons/respawn_system_2
adds a respawn/return to lobby system, tweaks cryo to preserve everything instead of just ""important items""
2020-12-22 17:40:33 +01:00
silicons ce10278c5a changes 2020-12-20 19:25:49 -07:00
silicons a4688557d7 Cryo 2020-12-13 02:29:31 -07:00
silicons 07d8e72125 fix 2020-12-12 11:19:45 -07:00
silicons 24c09edd03 stuff 2020-12-12 11:12:45 -07:00
silicons 45a7c68da1 wow 2020-12-11 15:05:00 -07:00
Timothy Teakettle 45b22b2855 final touches 2020-12-11 19:41:56 +00:00
timothyteakettle d1003c206a debug 2020-12-11 01:57:09 +00:00
Timothy Teakettle 62b5430985 yes 2020-12-10 21:53:20 +00:00
timothyteakettle 73542f6688 Update new_player.dm 2020-12-09 17:49:52 +00:00
timothyteakettle 264b72f91d better verification 2020-12-09 02:01:37 +00:00
Timothy Teakettle d3ad092869 new proc 2020-12-08 22:23:58 +00:00
Timothy Teakettle f950424785 more text changes 2020-11-10 16:00:19 +00:00