shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
46,380 Commits 5 Branches 0 Tags
cdaefe18f6984d0dadd5ea24dbb8dc9f4de36301
Commit Graph

10136 Commits

Author SHA1 Message Date
Putnam3145
e1c822cbd8 TGUI; actually fixes station announcer 2022-08-07 17:17:58 -07: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
Lin
8b9014b52d Merge pull request #15610 from deathride58/hubrefresh2022 
Hub refresh 2022 - Cleans up update_status(), adds more hub-related config options, and more!
 2022-05-12 20:27:54 +00:00
Lin
dec7751f95 Merge pull request #15612 from SandPoot/status_displays 
Syncs status displays to tg's version
 2022-05-12 20:11:54 +00:00
SandPoot
90eab441aa Upload files 2022-05-09 18:50:17 -03:00
deathride58
f262d65261 fixes stray hyphen when station name is default 2022-05-05 20:02:20 -04:00
deathride58
40730237f2 Hub refresh - Cleans up update_status(), adds more hub-related config options, and more! 2022-05-05 14:52:53 -04:00
silicons
aa1bc4c1f1 Merge pull request #15608 from SandPoot/actually-fix-progbars 
Actually fixes dragging storage items into themself.
 2022-05-02 17:01:53 -07:00
SandPoot
c65f022d2b Update atoms.dm 2022-04-29 11:44:55 -03: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
silicons
aca2fa95e3 Merge pull request #15581 from deathride58/audiopanfix 
Fixes audio panning sounding weird by adding 1 to the Y value in playsoundlocal
 2022-04-27 16:11:24 -07:00
Putnam3145
beac1064db Makes adv. firefighter foam remove other gases 2022-04-25 22:11:18 -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
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
Artur
813ca511b5 Remaps sleepers to stasis beds and make stasis actually leave you 2022-04-06 15:58:27 +03:00
Artur
c36019bf56 Adds stasis beds 2022-04-06 15:38:05 +03:00
deathride58
4a9bcd3e5d Fixes audio panning sounding weird by adding 1 to playsoundlocal's zlevel calculations 2022-04-04 20:32:51 -04:00
Solaris-Shade
416c7412c8 Merge branch 'Citadel-Station-13:master' into Projectile_Rework 2022-04-04 16:58:17 -04:00
Lin
3d04fac657 Merge pull request #15576 from Putnam3145/fix-recycler-runtime 
Fix recycler runtime
 2022-04-02 07:17:31 +00: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
Solaris-Shade
a70fb1fb43 Merge branch 'Citadel-Station-13:master' into Projectile_Rework 2022-03-31 15:29:31 -04: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
06bda8946a wait, no, that's Lua-like, not even right 2022-03-30 14:55:15 -07:00
Putnam3145
a819424088 Fixes recycler runtime on emergency stop 2022-03-30 14:53:58 -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
Solaris-Shade
01f28163c2 Merge branch 'Citadel-Station-13:master' into Projectile_Rework 2022-03-24 20:40:31 -04:00
SandPoot
8cfb7a1bf4 They no longer snap south! 2022-03-24 01:03:42 -03:00
SandPoot
189716314f Would you like some defines in these trying times? 2022-03-23 12:10:02 -03:00
DeltaFire
a8ff45ca16 fix 2022-03-22 18:05:58 +01:00
Solaris-Shade
d9ff37d2ff Merge branch 'Citadel-Station-13:master' into Projectile_Rework 2022-03-19 11:23:16 -04:00
SandPoot
11daaadf79 arguments. 2022-03-18 18:43:40 -03:00
SandPoot
16fddbb140 Upload files 2022-03-18 18:35:29 -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
11522b7761 global var 2022-03-16 18:21:37 -03:00
SandPoot
baee52349b Upload files 2022-03-16 15:41:07 -03:00
SandPoot
fdb6413d23 You guys want some logs? 2022-03-16 15:22:04 -03:00
SandPoot
a8f454bd72 Upload files 2022-03-16 14:00:31 -03:00
silicons
a3284a0923 Merge pull request #15195 from DeltaFire15/med-revivalchem-nerf 
Weakens chemistry's revival chems
 2022-03-13 14:24:57 -07:00