shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
47,076 Commits 5 Branches 0 Tags
e4d687da0ca3ecbd1ea00c84b7cebebeaaabe478
Commit Graph

6362 Commits

Author SHA1 Message Date
shellspeed1
142c07c51d Merge branch 'master' into premium-kas-for-borgs 2022-09-23 17:00:02 -07:00
silicons
b0703d1bd9 Merge pull request #15854 from shellspeed1/borg-radio-improvements 
Ports Adding radio access to borgs by default from splurt. Credit to NopemanMcHalt for the splurt port and Ayfa212 for the initial work.
 2022-09-23 16:26:54 -07:00
silicons
96384ac667 Merge pull request #15856 from shellspeed1/borg-mining-ID-fix-and-premium-KA-return 
Fixes the mining borg point card
 2022-09-23 16:24:36 -07:00
silicons
a1fc1e0377 Merge pull request #15855 from shellspeed1/borg-pda-addition 
Ports borg pdas from hyper. Credit to haha26315 for the orginal PR and BongaTheProto for their port to splurt.
 2022-09-23 16:16:03 -07:00
shellspeed1
2d90e0ab33 readds the premium ka but for borgs 2022-09-17 19:03:03 -07:00
shellspeed1
d83747dc74 Ports Quantum Spin Inverter from TG. (#15846) 
* ports bluespace swapper

* fixes materials so we can print quantum spin inverters

* its diamond not diamoond
 2022-09-17 13:39:32 -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
22d22447d2 removes the premium KA 2022-09-17 06:36:49 -07:00
shellspeed1
d7a2f14298 fixes and ka 2022-09-17 03:46:24 -07:00
shellspeed1
11ec2b89e0 borg pda 2022-09-17 02:40:37 -07:00
shellspeed1
8d9804e953 adds radio access to borgs by default 2022-09-17 02:20:36 -07:00
silicons
4f82820062 Merge pull request #15781 from zeroisthebiggay/breadbay 
the great medbay resprite PR: ported from a freshly merged TG PR
 2022-08-20 12:24:46 -07:00
Putnam3145
d08a570c5f Makes binary translator not show a wrong description 2022-08-18 21:51:39 -07:00
Cognition
0c12f3f111 Removes persistence from glowing goo 2022-08-16 19:49:16 -06:00
zerothebigboy
d5b380d7b3 iloathecitadelchanges 2022-08-13 18:22:30 -04:00
zerothebigboy
4e0498573f thefartdomeengages 2022-08-13 18:16:37 -04:00
zerothebigboy
1bc3796b06 watchmegetgitbanned 2022-08-11 19:17:16 -04: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
Linzolle
cd1389ae0f fix catwalks 2022-08-02 22:59:59 -07:00
silicons
76cac539b5 Update defib.dm 2022-07-31 16:42:38 -07:00
silicons
eb7b3f706f Update closets.dm 2022-07-28 16:17:46 -07:00
SandPoot
33bfcf67b5 solves missing keyword args 2022-07-03 01:37:26 -03:00
SandPoot
09e351277a this 2022-07-03 01:28:39 -03:00
silicons
253be000c0 Merge pull request #15676 from TrojanCoyote/trojancoyote 
HoS plate carrier
 2022-06-19 18:56:16 -07:00
TripleShades
ca57269f66 WHY DID THIS NOT GET TESTED EVER 2022-06-15 17:29:17 -04:00
silicons
1b661f725b Merge pull request #15664 from deathride58/minimaprefresh 
Minimap Refresh - higher detail, JS fixes, pixel-perfect scaling, and more!
 2022-06-10 22:09:52 -07:00
silicons
9a17ef3bf2 Merge pull request #15663 from deathride58/blockquotes 
Blockquotes for chat; Prettier examine text and more!
 2022-06-10 22:09:12 -07:00
TrojanCoyote
9f37ed4d35 Update code/game/objects/structures/crates_lockers/closets/secure/security.dm 
Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>
 2022-06-10 19:27:14 -05:00
TrojanCoyote
b4aa87431b swap things around 
tosses plate carrier into HoS locker, out of loadout options <3
 2022-06-10 19:17:25 -05: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
deathride58
75983aca0d makes railings climbable both ways. without issues. in literally one single line 2022-06-06 01:31:51 -04:00
deathride58
b02372afb0 minimap refresh - high-detail, JS fixes, pixel-perfect scaling, and more! 2022-06-04 22:44:15 -04:00
deathride58
04a0a3b869 chat blockquotes; prettier examine text and more! 2022-06-03 18:55:18 -04: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
deathride58
20eb61b319 makes slimes specifically have overlay-blended blood! 2022-05-26 22:56:10 -04:00
deathride58
a37c3a8721 multiplicative blood - makes the majority of blood visuals use multiplicative blending 2022-05-25 03:25:20 -04:00
deathride58
f9ea85852e fixes blood trails looking Wonky by removing their base iconstate 2022-05-18 21:40:35 -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
ce7d7a5124 Merge pull request #15594 from SandPoot/stasis-beds-update 
Makes stasis beds *slightly* less hated
 2022-04-27 16:11:34 -07:00
Putnam3145
beac1064db Makes adv. firefighter foam remove other gases 2022-04-25 22:11:18 -07:00
SandPoot
5d4bae4482 Update files 2022-04-10 23:27:12 -03:00
SandPoot
2555843026 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload) 2022-04-09 03:06:56 -03:00
Lin
fd286c325e Merge branch 'master' into Projectile_Rework 2022-04-09 04:19:56 +00: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
Solaris-Shade
48db01702b Merge branch 'Citadel-Station-13:master' into Projectile_Rework 2022-04-06 22:31:51 -04:00
SandPoot
586a035132 Update files 2022-04-06 18:41:31 -03:00
silicons
c8cab13081 Merge pull request #15565 from SandPoot/custom-statues 
Custom statues and sculpting changes.
 2022-04-06 12:12:24 -07:00
Artur
3824daba05 Trailing newlines 2022-04-06 16:10:57 +03:00