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

6340 Commits

Author SHA1 Message Date
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
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
Artur
c36019bf56 Adds stasis beds 2022-04-06 15:38:05 +03: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
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
baee52349b Upload files 2022-03-16 15:41:07 -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
Solaris-Shade
0395ba47d7 Merge branch 'master' into Projectile_Rework 2022-03-11 23:07:31 -05:00
Solaris-Shade
a478945424 Merge conflict one 2022-03-11 22:49:16 -05:00
Solaris-Shade
171bd18c8a Updated Projectile code some more. 2022-03-11 22:23:01 -05:00
Solaris-Shade
c5be81c589 tg moved projectiles out of /item, added '/item' back 2022-03-06 16:29:58 -05:00
Solaris-Shade
2fdb70b2b9 [DNM][DNM][WIP] Projectile backend code port and update 
Ports#54924,  #65061, #59804 from /tg.
adds auxiliary code from /tg to make code work.
 2022-03-06 15:20:23 -05:00
SandPoot
21b68944e7 Upload files 2022-03-05 16:00:12 -03:00