Commit Graph

1842 Commits

Author SHA1 Message Date
evilew 3bd6de943c vote fix?
- make it so if no one votes on round continuing, the station will carry on
2024-12-10 20:39:07 +01:00
Alphas00 70de1c7076 Roundend and Shuttle Recall fixes
Fixed roundend error due to fatness permanence saving
Fixed vote shuttle not being recallable by admins
2024-12-08 19:33:37 +01:00
evilew 118591046d Revert "tweaked voting code"
This reverts commit 0d91a9de6d.
2024-12-06 13:06:59 +01:00
evilew 0d91a9de6d tweaked voting code
- removed the whole mechanic where extending the round requires an increasing amount of people to vote (based on the amount of times the vote has appeared)
2024-12-02 22:31:41 +01:00
evilew 4fd1e6dc79 voting doesn't require incremental wins
- changed it so amount required to pass a continuation votes doesn't increase with next votes
2024-12-02 22:26:05 +01:00
Metis 9d7f14842c ladder and chasm fix 2024-11-21 22:16:50 -05:00
evilew 9d9f805d7b Merge branch 'master' into gatofication2 2024-11-21 22:11:24 +01:00
evilew 10ef9e374a Nanotrasen to GATO - comments
I know it's a mess, but the least I can do is add comments anywhere I can
2024-11-19 01:59:28 +01:00
Metis 4bd63db80f Merge remote-tracking branch 'upstream/master' 2024-11-17 16:55:40 -05:00
AlManiak ce1081a8dc Added Vegetarian quirk 2024-11-10 18:35:14 +01:00
evilew edea3ae8e0 nanotrasen to gato
Replaced most instances of Nanotrasen mentions into GATO, though I've kept some that have more sense to be kept as Nanotrasen (like nanotrasen marked stuff and such)
2024-11-09 23:05:02 +01:00
Metis f6af059a06 job titles 2024-11-02 03:16:16 -04:00
Metis b915cdcbb5 Update economy.dm 2024-10-10 16:47:56 -04:00
Metis 6494544bb8 normalizers and strong legs 2024-10-10 10:59:52 -04:00
evilew cb5cba673b Revert "gs13 maps port"
This reverts commit f16e6cc3a6.
2024-10-08 23:12:55 +02:00
evilew f16e6cc3a6 gs13 maps port
- meta and box are fixed in this commit, however they will still need a lot more fixing
2024-09-30 15:21:02 +02:00
evilew 9950e38d03 doing stuff with title screens + configs 2024-09-24 22:26:57 +02:00
Metis 4c1656f24d maps 2024-09-18 21:34:12 -04:00
Metis 8b3b46f9af mapping stuff (I am not even done yet) 2024-09-16 23:58:29 -04:00
SandPoot c07e94be66 push 2024-08-24 21:28:55 -03:00
SandPoot 0a074ecb63 Purpose found
Co-authored-by: deathride58 <deathride58@users.noreply.github.com>
2024-05-17 21:38:45 -03:00
SandPoot 8d4b317800 poosh 2024-05-17 15:12:55 -03:00
deathride58 dd8c641520 Merge pull request #15486 from SandPoot/kills-cache
Solves issues with overlays by updating the whole subsystem
2024-04-12 23:31:54 -04:00
SandPoot e40960a3a2 sadly necessary 2024-04-12 22:18:43 -03:00
SandPoot 91045350e5 overlay stuff 2024-04-12 22:01:03 -03:00
SandPoot dfe90dfb61 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into pr/SandPoot/15486 2024-04-12 20:48:41 -03:00
SandPoot ea41329544 some random math, if it's too low, or too high, change later 2024-04-10 23:01:39 -03:00
SandPoot ca8ce67cd6 mail 2024-04-10 20:54:04 -03:00
SandPoot 68fa21d602 content 2024-04-05 17:57:54 -03:00
SandPoot 676cb864b1 missed proc refs 2024-03-12 22:17:30 -03:00
Katherine Kiefer fd29f9c902 initial 2024-03-09 21:16:02 +11:00
SandPoot a65f323734 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into proc-define-shit 2024-03-08 19:10:22 -03:00
SandPoot c7a2565255 stop this nonsense 2024-01-05 00:28:56 -03:00
SandPoot 7eaef36e11 d k daunkey kaung 2024-01-03 22:42:03 -03:00
deathride58 ce1d757159 Merge pull request #16016 from SandPoot/throwing-update
[TESTMERGE] Updates firemanning, throwing stuff
2023-12-28 22:44:59 -05:00
SandPoot b9a422ee2d throw at mobs laying down 2023-12-18 14:07:25 -03:00
SandPoot 27bdd4b732 aiModule > ai_module 2023-12-17 23:20:43 -03:00
SandPoot 7b62dbe7bb ai + mech 2023-12-17 23:15:59 -03:00
SandPoot a558377206 more stuff i can't guarantee works by itself yet 2023-11-29 23:37:15 -03:00
SandPoot 40f1d7401d procs 2023-11-29 22:40:13 -03:00
SandPoot 55e0e5de06 real quick 2023-10-28 17:54:31 -03:00
SandPoot 0b6d743e22 go 2023-10-28 17:51:02 -03:00
SandPoot 6df09381bd Update overlays.dm 2023-10-13 16:40:43 -03:00
Katherine Kiefer 117690b5a3 use the config 2023-08-18 22:38:21 +10:00
Katherine Kiefer 0870fa9734 disable eq 2023-08-18 22:36:39 +10:00
Katherine Kiefer 16a490ee5c update auxmos 2023-08-18 22:13:30 +10:00
Lin 654e5dad9d Merge pull request #15864 from Putnam3145/auxmos-2
UPDATE AUXMOS TO 2.0.0 (TESTMERGE THIS HOLY CRAP)
2023-04-01 00:17:22 -07:00
Drulikar ad145751a7 Fix admin command to load away missions. 2023-03-26 00:01:04 -07:00
Timothy Teakettle 390dcbcea0 Merge pull request #15966 from SandPoot/accessory-equip
Adds accessory quick-equip, a tab for it on the loadout and previews for accessories on the prefs screen
2023-02-09 21:39:05 +00:00
SandPoot 5052f836e7 the stuff 2023-02-06 19:54:54 -03:00