379 Commits

Author SHA1 Message Date
AlManiak 19f4c34381 Added Big Gulps
Fixed earshattering fryer sound overshadowing ding sound
2024-10-24 17:03:27 +02:00
AlManiak 854a0cf4b4 Initial commit of a working state 2024-10-13 22:48:31 +02:00
chel ea326f9d6d pickup & drop sounds 2024-04-11 20:01:48 -03:00
KrissKr0ss 66aa1cb05c Revert "Merge pull request #15929 from JerryWester/revert-15894-modsuits"
This reverts commit 48e713ff33, reversing
changes made to efb2d19cb9.
2023-05-01 00:16:20 -05:00
Jerry Wester ae347f3399 Revert "MODsuits" 2023-01-08 17:30:26 -07:00
Jerry Wester f7ac3c7624 beeg commit 2022-12-11 20:32:35 -07:00
shellspeed1 3dace329be adds public bounty consoles without inflation, also removes the mint 2022-09-17 19:27:40 -07:00
shellspeed1 d9e15776ee Ports the RBMK reactor from both NSV using Hyper and Splurt code (WIP) (#15847)
* sprites and sounds

* The code for the reactor itself

* Update code/modules/power/reactor/rbmk.dm

Co-authored-by: Putnam3145 <putnam3145@gmail.com>

* Update code/modules/power/reactor/rbmk.dm

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>

* Map stuff

* Removes Clamps.

* Matrices separated, this was a mistake on my part.

* Update tgstation.dme

* removal as per putnam's review

* redfines highest available as 1007

* possible soundloop fix? probably not.

* temporary config thing to make engine load

* changes to map template from splurt

* Update code/modules/power/reactor/rbmk.dm

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>

* Update code/modules/power/reactor/rbmk.dm

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>

* actually somehow fixed the runtimes?

* old maps from hyper, not needed..

* Revert "old maps from hyper, not needed.."

This reverts commit 92ccd89952d360206926d8b57e82084994a6a0d6.

* take two on removal

* fixes power output

* Update code/modules/power/reactor/rbmk.dm

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>

* Update code/modules/power/reactor/rbmk.dm

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>

* deals with the double turf

* Revert "temporary config thing to make engine load"

This reverts commit 7f52188d5261cd60024ef36cf7c33df0748d0c79.

* was told to bring it back

* don't need to change these

* next time I'll just copy paste it instead of type it.

* a

* Flexi Seal crate so we can fix the reactor

* set power to 0 so it can be fixed

* nerfs power output

Co-authored-by: Putnam3145 <putnam3145@gmail.com>
Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>
2022-09-17 13:33:51 -07:00
zeroisthebiggay 7aeec9b083 replaces weight machine sprites with TG's and subsequently wipes a portion of the goon file's existence (#15829)
* basedado

* becnhpress
2022-08-31 21:38:44 -07:00
silicons d438103cf9 Merge pull request #15761 from Hatterhat/fatrolling
bloodborne (adds dodgeroll combat RMB to the cleaving saw, confers melee/projectile iframes)
2022-08-20 12:27:04 -07: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 fdd03402ed dark souls 2022-08-06 16:25:28 -05:00
deathride58 17917ed564 bark followup - audio balance pass, bark intercepts, yelling nerf, falloff fix, etc! 2022-06-11 19:39:48 -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
SandPoot 4e296b72d5 Upload files 2022-04-09 15:42:57 -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
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
SandPoot 16fddbb140 Upload files 2022-03-18 18:35:29 -03:00
SandPoot a8f454bd72 Upload files 2022-03-16 14:00:31 -03:00
keronshb f1ca283318 Merge branch 'master' into familyport 2022-02-11 14:04:57 -05:00
Putnam3145 629ce5bea6 Station traits 2021-12-08 16:17:35 -08:00
LetterN 8dcfea5817 Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2021-11-21 10:34:14 +08:00
LetterN fa6946fae4 added the funny. Also adds balloon_alert to more stuff (primarily atmos) 2021-11-16 16:10:12 +08: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
keronshb 3cfea7eb92 Ball2021 2021-10-16 00:02:05 -04:00
keronshb 6b23d177c8 Merge remote-tracking branch 'upstream/master' 2021-10-15 19:25:41 -04:00
keronshb 41013ec815 Part 2 - Missing stuff from original families port 2021-10-12 12:07:02 -04:00
DeltaFire 66e81e7fda asay ping time 2021-10-11 19:52:30 +02:00
silicons 5ff4a2ace5 Merge pull request #15180 from LetterN/achives-
Achivement & Clowncar update
2021-09-28 00:15:52 -07:00
silicons 06771cd47a Merge pull request #15189 from zeroisthebiggay/minkraft
a new maintenance ambience
2021-09-28 00:15:16 -07:00
zerothebigboy baf4b90e0c lmao i love coding 2021-09-20 22:58:39 -04:00
LetterN 0b7e514739 t 2021-09-19 14:05:28 +08:00
buffyuwu bdf46b1d46 meme pr 2021-09-18 04:53:17 -04:00
silicons 2192d8a87e Merge pull request #14817 from zeroisthebiggay/endit
[READY] tempgun rebalance (it's not a nerf don't worry)
2021-08-02 17:11:20 -07:00
silicons d0b3857cb6 Merge pull request #14842 from WanderingFox95/WanderingFox95-TheWheelchairPRs
[Ready] Wheelchair Sprite Rollback + Motorized Hoverchairs
2021-07-09 16:50:00 -07:00
silicons 3c7786dafd Merge pull request #14734 from keronshb/SpaceDragon
(READY) Ports Space Dragon Midround Event.
2021-06-18 20:03:43 -07:00
WanderingFox95 48a993d0c0 Oh yeah, forgot the new noise, whoops 2021-06-14 22:40:11 +02:00
zerothebigboy fa738856bf i need a nap 2021-06-10 03:22:34 -04:00
silicons 09d61c3bec Merge pull request #14776 from WanderingFox95/WanderingFox95-CatSurgeon
New Challenger: The Cat Surgeon has appeared! (Ready!)
2021-06-09 11:29:24 -07:00
silicons eb4b4088f4 Merge pull request #14760 from keronshb/floorcluwneport
Ports Floor Cluwnes and Cluwnes.
2021-06-09 11:21:22 -07:00
silicons 716c2a04e4 Merge pull request #14160 from keronshb/motivation
Adds a new traitor item, Motivation (Part 1)
2021-06-09 11:10:17 -07:00
keronshb 70926f5daf Merge remote-tracking branch 'upstream/master' into floorcluwneport 2021-05-31 22:21:34 -04:00
WanderingFox95 398491b584 It's on the nose but here's a sound for the spawn. 2021-05-31 00:42:33 +02:00
keronshb 78db6bd5c2 Ports Floor Cluwnes
Oh fuck oh god
2021-05-26 21:58:35 -04:00
silicons eba3f554bc Merge pull request #14737 from zeroisthebiggay/KILL
Traitor's Bizarre Adventure Episode One: Mauler Gauntlets Are Unbreakable
2021-05-23 08:52:25 -06:00
zerothebigboy bc61ada440 KILL 2021-05-19 13:24:40 -04:00
keronshb b8b25662ff Couple of fixes, almost ready to go 2021-05-18 22:12:02 -04:00
silicons 3dc78fa64d Merge pull request #14725 from zeroisthebiggay/baystation
now approaching: Baystation
2021-05-18 17:09:13 -06:00
WanderingFox95 15053d8064 Backwards Blade Slash. Yeah really. 2021-05-17 12:41:18 +02:00
zerothebigboy e06b354613 sex!!!!!!!!!! 2021-05-15 06:58:20 -04:00