cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-10 09:54:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,218 Commits 55 Branches 0 Tags
21c3abdfb7ad02be849653db5a17a043cdced542
Commit Graph

1451 Commits

Author SHA1 Message Date
BongaTheProto
ee6823c69b Merge remote-tracking branch 'upstream/master' 2022-12-13 12:14:11 -05:00
SandPoot
f4b7513f10 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-12-13 01:35:33 -03:00
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
BongaTheProto
a949e5d08c Merge remote-tracking branch 'upstream/master' 2022-10-28 16:43:28 -05:00
SandPoot
02e4551a27 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-10-25 22:52: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
BongaTheProto
b722359efd new butthole sprite 
squished alt
 2022-10-09 19:17:42 -05:00
BongaTheProto
7b25cd111a teh... donut... 
complaints incoming
 2022-10-03 22:58:32 -05:00
SandPoot
7039e0d806 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-10-02 14:15:44 -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
BongaTheProto
0ce3784cc7 Revert "Merge pull request #15824 from Putnam3145/why-is-it-like-this" 
This reverts commit 9d83e5da60, reversing
changes made to dd26852438.
 2022-10-01 12:55:57 -05:00
BongaTheProto
e1cb9c8346 Merge remote-tracking branch 'upstream/master' 2022-09-27 23:19:10 -05:00
SandPoot
93bc79ab6e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-09-27 01:28:10 -03:00
SandPoot
f039efca97 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-09-27 01:19:55 -03: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
BongaTheProto
9025f54d7a Merge pull request #464 from ItsSelis/tgui-input-framework 
TGUI Input Framework
 2022-09-20 10:27:32 -05:00
BongaTheProto
9cdaffc417 Merge remote-tracking branch 'upstream/master' 2022-09-18 23:40:20 -05:00
SandPoot
cc9c36bd13 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-09-17 22:48:51 -03: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
BongaTheProto
1e7436ec63 Merge pull request #468 from Zirok-BYOND/lighting_underlays 
Port underlay lighting from tgstation
 2022-09-16 19:00:32 -05: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
LamkasDev
fba9cd66de feat: add strapons 2022-09-05 16:34:26 +02:00
ItsSelis
b45db075fe Merge branch 'master' into tgui-input-framework 2022-09-03 23:59:32 +02:00
Zirok
3efd9fbf68 Various fixes, make things compile 2022-09-02 18:24:34 +02:00
Kylerace
5d2d68edc4 Cherry-pick the merge commit for tgstation PR 58991, implementing underlay Lighting 
Implements underlay lighting, turning lightin objects into a datum, for details see the tgstation PR.
 2022-09-02 18:22:15 +02:00
ItsSelis
cb7e71a7b9 Added Prefs 2022-08-31 16:51:51 +02: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
Pin-alternative
9e377c644b Merge remote-tracking branch 'upstream/master' into cursed 2022-08-23 07:41:40 +10:00
BongaTheProto
3341812b44 Merge remote-tracking branch 'upstream/master' 2022-08-20 17:16:19 -05:00
SandPoot
550db1b6ee Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-08-20 17:27:19 -03:00
Lin
4b21981547 ooc colour shenanigans (#15788) 2022-08-20 01:41:20 -07:00
Pin-alternative
9ba41fb085 Merge remote-tracking branch 'upstream/master' into cursed 2022-08-15 07:55:25 +10:00
BongaTheProto
9e7c5033cc Merge remote-tracking branch 'upstream/master' 2022-08-07 21:42:16 -05:00
SandPoot
00dadda3df Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-08-07 23:15:57 -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
Pin-alternative
32018d15dc Merge remote-tracking branch 'upstream/master' into cursed 2022-08-02 10:26:30 +10:00
James
f771ad67e4 Version 01 2022-07-30 18:07:13 +01:00
Pin-alternative
d44e4cf056 stuffo 2022-07-22 22:56:10 +10:00
Pin-alternative
515f26c05b e 2022-07-10 20:16:01 +10:00
Pin-alternative
d4ec28ae85 move some shiez 2022-06-24 20:08:09 +10:00
Pin-alternative
f59bb6032e get this stuff done 2022-06-23 20:07:12 +10:00
BongaTheProto
03f4c65fc4 Merge remote-tracking branch 'upstream/master' 2022-06-11 23:25:29 -05:00
SandPoot
07a4c5c12b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-06-11 04:54:12 -03: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