Commit Graph

1288 Commits

Author SHA1 Message Date
Lin 7205781c47 Merge pull request #15892 from SandPoot/let's-sing-the-reference-clearing-song
Solves some harddels
2022-12-12 19:11:49 -07:00
SandPoot 8911fe5e0b clear em 2022-12-11 17:58:45 -03: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
silicons d3f05f7830 Revert "Allow AI, mime, clown to have the same name as LITERALLY ANY MOB IN THE WORLD(???)" 2022-10-02 08:44:02 -07:00
Lin 9d83e5da60 Merge pull request #15824 from Putnam3145/why-is-it-like-this
Allow AI, mime, clown to have the same name as LITERALLY ANY MOB IN THE WORLD(???)
2022-09-26 05:23:37 +00:00
silicons a8ef986ce5 Merge pull request #15848 from shellspeed1/full-auto-port-from-tg-Credit-to-Fikou
Port of a bunch of stuff to update guns at this point because we have a bunch of stuff we are missing.
2022-09-23 16:27:03 -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
shellspeed1 1130a9341e now it actually works 2022-09-09 20:02:45 -07:00
shellspeed1 f2ed6a571c this gets it to the point it compiles 2022-09-09 18:04:52 -07:00
Putnam3145 7cc55cbc97 redundant safety check 2022-08-27 18:33:42 -07:00
Putnam3145 b2666019bc allow people to have dupe names (??) 2022-08-27 18:30:41 -07:00
Lin 4b21981547 ooc colour shenanigans (#15788) 2022-08-20 01:41:20 -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
silicons 59a7ab04da Merge pull request #15677 from deathride58/vocalbark
Vocal barks - Fully customizable noises for talking!
2022-06-10 22:10:44 -07:00
silicons 63da07377b Merge pull request #15673 from deathride58/userfriendlycolormates
User-friendly colormates - adds HSV coloration to colormates! (and more)
2022-06-10 22:10:06 -07:00
deathride58 f30c9406cc randomization! 2022-06-09 15:29:48 -04:00
deathride58 2a720ce054 vocal barks - Fully customizable noises for talking! 2022-06-09 03:59:17 -04:00
deathride58 fa24f1bd3a user-friendly colormates - adds HSV coloration to colormates! 2022-06-07 16:36:10 -04:00
Lin 6f97ec2b1d Merge pull request #15656 from deathride58/animfix
Animation refresh - Fully restores animations broken by BYOND updates, some light animation-related tweaks, and more
2022-06-07 18:05:07 +00:00
Lin a955077ffd Merge pull request #15660 from deathride58/nukeopsatpride
You've heard of "no cops at pride". Now get ready for...
2022-06-07 17:18:17 +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 a1fb7fc613 Community request! 2022-06-02 17:52:03 -04:00
deathride58 5f62b5fa76 You've heard of no cops at pride. Now get ready for... Nukeops at pride 2022-06-02 17:47:33 -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
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
SandPoot 8bb1c2b32a Upload files 2022-05-30 01:31:54 -03:00
Putnam3145 0897aac2c8 Fixed command report sound 2022-05-27 19:31:46 -07:00
deathride58 113981b5a8 Jukebox refresh - Jukebox queue, preliminary multiz support, working volume knob, and more! 2022-05-21 00:21:58 -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
silicons da09439093 Merge pull request #15585 from SandPoot/Initialize(mapload)
Every case of initialize that should have mapload, does
2022-04-15 17:41:57 -07:00
SandPoot 13fb647b9e Update files (#15597) 2022-04-15 16:31:50 +02: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
SandPoot 586a035132 Update files 2022-04-06 18:41:31 -03:00
Artur c36019bf56 Adds stasis beds 2022-04-06 15:38:05 +03:00
SandPoot f020aca3dd Update path.dm 2022-04-06 00:04:24 -03:00
Lin 2a884f4e01 Merge pull request #15578 from SandPoot/fix-weird-diagonal
Fixes pathfinding not checking diagonal passability properly.
2022-04-02 07:17:02 +00: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
SandPoot 06528b61ae Update files 2022-03-30 22:32:58 -03:00
Putnam3145 d5c36b4a99 I have no idea how I managed to lose this! 2022-03-30 12:55:37 -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
Lin 22a49c1dd7 Merge pull request #15564 from SandPoot/bad-getatomonturf
Fixes balloon alerts sourced on turfs
2022-03-20 22:30:34 +00:00
SandPoot 3ee2d12b34 Upload files 2022-03-18 12:45:07 -03:00
SandPoot 96e38e965b Merge branch 'master' into mechs-are-vehicles 2022-03-17 22:23:48 -03:00
SandPoot 4da5a57688 global 2022-03-16 18:33:32 -03:00
SandPoot 37fef7fbba Upload files 2022-03-16 15:33:31 -03:00
SandPoot fdb6413d23 You guys want some logs? 2022-03-16 15:22:04 -03:00