shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
42,089 Commits 5 Branches 0 Tags
60a720eead2c8e15f3aab6ef799c01edaaffe91c
Commit Graph

42089 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
qweq12yt 60a720eead ok so now it works 2021-03-19 16:10:54 -03:00
qweq12yt 27774c4209 git is acting weird.jpg 2021-03-19 16:10:17 -03:00
qweq12yt 4838dd40de small typo 2021-03-19 16:06:23 -03:00
qweq12yt a3ba3c1928 fix ui not opening 2021-03-19 15:36:14 -03:00
kappa-sama 1f7b15d8f8 clonwops 2021-03-19 15:35:17 -03:00
kappa-sama 2e41925392 poggers 
Co-authored-by: lolman360 <22850904+lolman360@users.noreply.github.com>
 2021-03-19 15:32:54 -03:00
kappa-sama 524bb79f0e tgui machine broke 2021-03-19 15:32:53 -03:00
Changelogs 5e6122e554 Automatic changelog compile [ci skip] 2021-03-19 00:14:43 +00:00
CitadelStationBot 3afd1bbf03 Automatic changelog generation for PR #14444 [ci skip] 2021-03-18 07:41:41 -05:00
silicons 8c97297a47 Merge pull request #14444 from DeltaFire15/jar-removal 
Locks Bluespace Jars to be admin-only
 2021-03-18 06:41:38 -06:00
CitadelStationBot 0dc00784a8 Automatic changelog generation for PR #14442 [ci skip] 2021-03-18 07:40:53 -05:00
silicons f6f2c27e90 Merge pull request #14442 from SandPoot/master 
Adds the skirt variant of the "Tactitool Turtleneck" to the loadout
 2021-03-18 06:40:51 -06:00
CitadelStationBot 3edcdf15db Automatic changelog generation for PR #14456 [ci skip] 2021-03-18 07:39:50 -05:00
silicons 3e8fcfe72a Merge pull request #14456 from Putnam3145/antag_pref 
Added a "no antags please" pref
 2021-03-18 06:39:48 -06:00
silicons bb03d4ff41 Merge pull request #14446 from The-Sun-In-Splendour/secciejacket 
shameless buff to sec jacket
 2021-03-18 06:39:24 -06:00
CitadelStationBot 0be7ad78ac Automatic changelog generation for PR #14451 [ci skip] 2021-03-18 07:39:17 -05:00
silicons f39cac6a46 Merge pull request #14451 from zeroisthebiggay/patch-5 
fixes spriteless heretic book
 2021-03-18 06:39:15 -06:00
CitadelStationBot 8ae79c09d1 Automatic changelog generation for PR #14391 [ci skip] 2021-03-18 07:38:43 -05:00
silicons e0cc6e3502 Merge pull request #14391 from kiwedespars/void-but-for-real 
[HERETICS] Void & a handful of heretics-related PRS
 2021-03-18 06:38:40 -06:00
Changelogs d64d0dad54 Automatic changelog compile [ci skip] 2021-03-18 00:14:44 +00:00
CitadelStationBot 246546570c Automatic changelog generation for PR #14448 [ci skip] 2021-03-17 16:32:14 -05:00
Lin f3fb22a2ab Merge pull request #14448 from Arturlang/give_fixes 
Literally just adds targets to give because i forgot to do that
 2021-03-17 16:32:11 -05:00
CitadelStationBot fe9c36e069 Automatic changelog generation for PR #14406 [ci skip] 2021-03-17 11:01:54 -05:00
DeltaFire 45c3f2b222 Merge pull request #14406 from Hatterhat/hypoprints 
a PR about empty hypospray kits, vial printing, along with a thing about quantum electromag
 2021-03-17 17:01:47 +01:00
Hatterhat 97e0e01265 ok 2021-03-17 03:25:06 -05:00
Putnam f3ea1b1a0c Relabeled to "Antag"; unambiguized in 2021-03-16 22:53:55 -07:00
Putnam d990328e29 Added a "no antags please" button 2021-03-16 22:37:39 -07:00
SandPoot 6bf711d7ec Update syndicate.dm 2021-03-16 22:54:59 -03:00
Lin 40fb1f2a0b Merge pull request #14445 from Citadel-Station-13/silicons-patch-7 
ghost swords now properly set force instead of just working on mobs
 2021-03-16 20:48:10 -05:00
Changelogs 400485c527 Automatic changelog compile [ci skip] 2021-03-17 00:14:31 +00:00
zeroisthebiggay 7f1b0e388c Update eldritch_book.dm 2021-03-16 18:22:13 -04:00
CitadelStationBot 4053758828 Automatic changelog generation for PR #14347 [ci skip] 2021-03-16 14:32:01 -05:00
DeltaFire b105a3c831 Merge pull request #14347 from timothyteakettle/language-tab 
the speech panel pr
 2021-03-16 20:31:58 +01:00
kiwedespars 158008b80f maybe too big a buff 2021-03-16 11:05:49 -07:00
kiwedespars 1886bef04e changes 
- void blade requires colder temps
- boogie woogie fueltank swap
- sicklebreak buff
- big domain expansion buff
- grasping carving nerf
- clamps silence maybe
 2021-03-16 03:23:18 -07:00
Artur fe218150f0 Literally just adds targets to give because i forgot to do that 2021-03-16 11:48:21 +02:00
CitadelStationBot 50631f3bbd Automatic changelog generation for PR #14141 [ci skip] 2021-03-16 01:39:43 -05:00
DeltaFire 79a464ca8c Merge pull request #14141 from KeRSedChaplain/clockcultrework_v2 
Clockwork cult rite additions and other edits
 2021-03-16 07:39:41 +01:00
Heretical Lizard fb9ecc50d5 Update code/modules/antagonists/clockcult/clock_structures/ratvar_the_clockwork_justicar.dm 
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
 2021-03-16 02:32:56 -04:00
The-Sun-In-Splendour 3dfa54270f Update labcoat.dm 2021-03-16 06:49:45 +01:00
silicons df92faadd4 Update necropolis_chests.dm 2021-03-15 19:05:25 -07:00
Lin 73b29bcca0 Merge pull request #14438 from Citadel-Station-13/shrinemaidendonator 
Adds Shrine Maiden outfit for donator
 2021-03-15 19:27:24 -05:00
Changelogs 5c4ecc6261 Automatic changelog compile [ci skip] 2021-03-16 00:14:12 +00:00
Dan-Neposh beed7f91ce Merge remote-tracking branch 'origin/clockcultrework_v2' into clockcultrework_v2 2021-03-15 18:30:30 -04:00
DeltaFire 2d43fd06e8 qdel 2021-03-15 23:14:29 +01:00
Dan-Neposh 57bfec61b9 sound fixes for Ratvar's ending sequence 2021-03-15 18:08:02 -04:00
DeltaFire f99c17012c removes jars from techweb 2021-03-15 22:26:05 +01:00
Dan-Neposh d1d29503d2 sound fixes for Ratvar's ending sequence 2021-03-15 17:25:52 -04:00
Dan-Neposh f96c6bc728 Merge remote-tracking branch 'origin/clockcultrework_v2' into clockcultrework_v2 2021-03-15 16:33:38 -04:00
Heretical Lizard 791d8f133d Update code/modules/mob/living/living_defense.dm 
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
 2021-03-15 16:43:23 -04:00