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

42069 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Dan-Neposh
57bfec61b9 sound fixes for Ratvar's ending sequence 2021-03-15 18:08:02 -04: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
CitadelStationBot
c32f3644a6 Automatic changelog generation for PR #14439 [ci skip] 2021-03-15 15:17:46 -05:00
Dan-Neposh
39c9da93c9 deletes an unneeded space 2021-03-15 16:17:44 -04:00
silicons
4c8711bf40 Merge pull request #14439 from Putnam3145/nob-nerf 
Nerfs hyper-nob/nitryl's point values
 2021-03-15 14:17:44 -06:00
Dan-Neposh
076955ac41 fixes the transformation rites 2021-03-15 15:12:16 -04:00
DeltaFire
039a337842 Merge pull request #14416 from GrayRachnid/abductors-more-players 
Adjusts the abductors event to only trigger when there's 30 players.
 2021-03-15 17:02:33 +01:00
DeltaFire
be41ead215 Merge pull request #14319 from silicons/async_2 
enforces SHOULD_NOT_SLEEP on Life(), fixes some more process() sleeps that might be causing controller lockups
 2021-03-15 17:01:42 +01:00
DeltaFire
5444ceacb3 Merge pull request #14385 from Citadel-Station-13/silicons-patch-5 
fixes control_object being unnecessarily vv locked
 2021-03-15 16:46:08 +01:00
DeltaFire
1f34d14d7b Merge pull request #14382 from Citadel-Station-13/silicons-patch-4 
Fixes lavaland floor tiles/necropolis gate abstract objects being able to be radiated
 2021-03-15 16:44:49 +01:00
CitadelStationBot
2fcac37ebe Automatic changelog generation for PR #14421 [ci skip] 2021-03-15 10:35:09 -05:00
DeltaFire
e6b104880c Merge pull request #14421 from GrayRachnid/remove-illegals 
Removes the illegal tech node from a few common items that are found through space/gateway/lavaland exploration.
 2021-03-15 16:35:06 +01:00
CitadelStationBot
9c829b943f Automatic changelog generation for PR #14433 [ci skip] 2021-03-15 00:30:40 -05:00
silicons
42c330c23d Merge pull request #14433 from HeroWithYay/Light_Fix 
Fixes a spelling mistake.
 2021-03-14 23:30:38 -06:00
CitadelStationBot
fef8450d84 Automatic changelog generation for PR #14398 [ci skip] 2021-03-15 00:30:30 -05:00
silicons
5472186bc2 Merge pull request #14398 from LetterN/post-hardsync1.5 
post-hardsync1.5
 2021-03-14 23:30:26 -06:00
Putnam
700bfd71e3 Also reduces nitryl since I changed that too 2021-03-14 20:28:35 -07:00
Putnam
c30fdfe5fc Nerfs hyper-nob's point values 2021-03-14 20:14:32 -07:00
CitadelStationBot
b8e8161850 Automatic changelog generation for PR #14437 [ci skip] 2021-03-14 21:13:04 -05:00
Lin
63dc8f5d7e Merge pull request #14437 from Putnam3145/supernova-rebalance 
Tweaks supernova to not be inconsequential as often
 2021-03-14 21:13:02 -05:00
Putnam
9a3e1d0307 wow that's REALLY REALLY BAD 2021-03-14 19:02:44 -07:00