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

6457 Commits

Author SHA1 Message Date
deathride58
e75c413d42 Merge pull request #15652 from SandPoot/title-screen 
Updates the title screen
 2022-06-05 00:27:44 -04:00
deathride58
ca879a83f5 Merge pull request #15651 from timothyteakettle/oof-ouch-my-bones! 
adds paper skin and glass bones quirks
 2022-06-05 00:26:55 -04:00
silicons
ec01dc69ac Merge pull request #15642 from deathride58/multblood 
Multiplicative blood
 2022-06-01 15:14:09 -07:00
Lin
d20234f4c8 Merge pull request #15643 from bunny232/Ublood 
Universal blood accepts bug blood.
 2022-06-01 21:25:53 +00:00
deathride58
c5e0048efd oops - forgot to completely undo the de-fanging i did for testing! 2022-05-30 22:10:37 -04:00
deathride58
ee92230176 Moves newplayer button population to a dedicated proc, significantly reducing the hackiness involved for getting the agegate working proper 2022-05-30 22:08:49 -04:00
SandPoot
8bb1c2b32a Upload files 2022-05-30 01:31:54 -03:00
Timothy Teakettle
d74812758d indentation! 2022-05-29 20:09:44 +01:00
Timothy Teakettle
39f3cb195a blacklist people with no bones from glass bones, and those with no flesh from paper skin 2022-05-29 20:06:46 +01:00
deathride58
20eb61b319 makes slimes specifically have overlay-blended blood! 2022-05-26 22:56:10 -04:00
bunny232
c5c9821173 Update blood.dm 2022-05-26 02:11:16 -04:00
deathride58
a37c3a8721 multiplicative blood - makes the majority of blood visuals use multiplicative blending 2022-05-25 03:25:20 -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
Lin
9d86c5402a Merge pull request #15626 from SandPoot/emotes 
Minor touches on emotes
 2022-05-18 03:27:08 +00:00
SandPoot
5dad84a486 Update files 2022-05-16 21:44:25 -03:00
silicons
dc88c32c77 Update inventory.dm 2022-05-15 13:53:25 -07:00
silicons
ffe0a0a9e7 Update inventory.dm 2022-05-15 13:53:07 -07:00
silicons
26f6e92e70 Update inventory.dm 2022-05-15 13:52:33 -07:00
Lin
a899b5db81 Merge pull request #15607 from Putnam3145/auxmos-1 
Updates auxmos to 1.0 (plus other atmos stuff with it)
 2022-05-13 05:45:33 +00:00
Lin
4771754343 Merge pull request #15611 from LiteralMushroom/patch-5 
Alter form for wings.
 2022-05-12 20:12:22 +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
LiteralMushroom
cfce371c8a You can now actually select a wing color. 2022-05-11 16:06:17 -04:00
LiteralMushroom
e59824fe26 in different files? 2022-05-09 19:32:13 -04:00
LiteralMushroom
626ab0fb2b why are these 2022-05-09 19:29:32 -04:00
SandPoot
90eab441aa Upload files 2022-05-09 18:50:17 -03:00
LiteralMushroom
dd4aa993df wings/deco_wings isn't a real category 
fuck
 2022-05-07 15:10:27 -04:00
LiteralMushroom
ccd9a19356 actual option 2022-05-07 15:05:39 -04:00
LiteralMushroom
73f1417eef first commit (probably doesn't work) 2022-05-07 15:04:06 -04:00
Putnam3145
a7408beb4c Updated auxmos to 1.0 2022-04-28 21:07:51 -07:00
silicons
73d39db3c1 Merge pull request #15343 from SandPoot/deadmin-prefs 
Ports Automatic Deadminning from TG
 2022-04-15 17:44:55 -07: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
Artur
66ce34caa5 Signal and moves it to the back 2022-04-07 15:54:13 +03:00
Artur
3980c97d61 whoops wrong order 2022-04-07 15:32:22 +03:00
Artur
be46eba465 Moves stasis handling to component-based 2022-04-07 14:10:51 +03:00
SandPoot
586a035132 Update files 2022-04-06 18:41:31 -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
Solaris-Shade
416c7412c8 Merge branch 'Citadel-Station-13:master' into Projectile_Rework 2022-04-04 16:58:17 -04: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
SandPoot
189716314f Would you like some defines in these trying times? 2022-03-23 12:10:02 -03:00
Solaris-Shade
5596b04f5c Merge branch 'Citadel-Station-13:master' into Projectile_Rework 2022-03-22 20:37:16 -04:00
SandPoot
e9637bb688 Merge branch 'master' into deadmin-prefs 2022-03-22 15:35:46 -03:00
silicons
ff6ed43bc1 Merge pull request #15438 from LiteralMushroom/patch-5 
Makes it so alter form can affect eyes.
 2022-03-21 18:56:47 -07:00
Solaris-Shade
d9ff37d2ff Merge branch 'Citadel-Station-13:master' into Projectile_Rework 2022-03-19 11:23:16 -04:00