shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
43,568 Commits 5 Branches 0 Tags
08f251a88c898ce3a635909512303170483694de
Commit Graph

28420 Commits

Author SHA1 Message Date
GrayRachnid 5201cf6ac5 stops racism 2021-03-17 21:58:41 -04:00
Ludox fca5ede923 Shitcode has arrived 2021-03-18 02:32:54 +01: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
Hatterhat dd44ebae46 peak funny 2021-03-17 16:10:32 -05:00
Hatterhat 5fa06109ac lemme get uh 2021-03-17 15:49:57 -05:00
GrayRachnid b4969c4770 Fixes auto-calling for non-heads and adds secure holopads 2021-03-17 12:40:25 -04: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
LetterN 69982f6315 fixes https://github.com/Citadel-Station-13/Citadel-Station-13/issues/14452 
and-might-have fi-x-ed https://github.com/Citadel-Station-13/Citadel-Station-13/issues/14450
 2021-03-17 11:49:50 +08:00
YakumoChen 3aca657c1f Update uplink_kits.dm 2021-03-16 22:03:49 -04:00
YakumoChen 5f30c71321 Update uplink_kits.dm 2021-03-16 22:00:44 -04: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
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
LetterN 228105b391 laptop and closet decon fix 2021-03-16 14:47:28 +08: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
Artur 6f6eedb92c tweaks vampires not to die from bloodloss 2021-03-16 06:47:39 +02:00
silicons df92faadd4 Update necropolis_chests.dm 2021-03-15 19:05:25 -07:00
YakumoChen 757e7b34d7 Update code/game/objects/items/storage/uplink_kits.dm 
Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com>
 2021-03-16 00:57:56 +00: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
silicons 5d51025ad6 Merge remote-tracking branch 'citadel/master' into combat_v7 2021-03-15 14:39:16 -07:00
DeltaFire f99c17012c removes jars from techweb 2021-03-15 22:26:05 +01: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
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
necromanceranne 1de69e0dec uuuuh if you say so boss 2021-03-16 06:14:49 +11:00
Dan-Neposh 076955ac41 fixes the transformation rites 2021-03-15 15:12:16 -04:00
necromanceranne 832fb7a6f8 oops, this should fix that failed check...I hope 2021-03-16 06:03:22 +11:00
necromanceranne 29a28d4ed8 keeps knockdown on rng throw, because you deserve it if you land it 2021-03-16 05:52:38 +11:00
necromanceranne 6ebc911937 Batons knockdown and slowdown on rightclick, otherwise they stagger, but always do damage. Damage respects melee armor, but power cells grant armor pen based on max charge. 2021-03-16 04:48:55 +11: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
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
SandPoot 5d13d61ea7 upload files 2021-03-15 11:11:17 -03:00
LetterN a478555dbd mapfix 2021-03-15 21:02:50 +08:00
silicons 42c330c23d Merge pull request #14433 from HeroWithYay/Light_Fix 
Fixes a spelling mistake.
 2021-03-14 23:30:38 -06:00
silicons 5472186bc2 Merge pull request #14398 from LetterN/post-hardsync1.5 
post-hardsync1.5
 2021-03-14 23:30:26 -06:00
Putnam 8868ef2a89 Made slaughter demon have higher weight if there's more blood. 2021-03-14 21:06:53 -07:00
Putnam 700bfd71e3 Also reduces nitryl since I changed that too 2021-03-14 20:28:35 -07:00