shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
41,468 Commits 5 Branches 0 Tags
fb9ecc50d51ba18c8dfb63bf1d5a5a173eb91015
Commit Graph

18174 Commits

Author SHA1 Message Date
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
Dan-Neposh
57bfec61b9 sound fixes for Ratvar's ending sequence 2021-03-15 18:08:02 -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
Dan-Neposh
39c9da93c9 deletes an unneeded space 2021-03-15 16:17:44 -04:00
Dan-Neposh
076955ac41 fixes the transformation rites 2021-03-15 15:12:16 -04:00
Dan-Neposh
e29606e5f3 addresses code suggestions from Deltafire 2021-03-07 20:47:07 -05:00
Heretical Lizard
60b4aa58cd Update code/modules/antagonists/clockcult/clock_helpers/clock_rites.dm 
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
 2021-03-07 02:15:19 -05:00
Heretical Lizard
55e337a9a4 Update code/modules/antagonists/clockcult/clock_helpers/clock_rites.dm 
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
 2021-03-07 02:15:06 -05:00
Heretical Lizard
63d21d151c Update code/modules/mob/living/living_defense.dm 
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
 2021-03-07 02:13:03 -05:00
Heretical Lizard
263c7a9854 Update code/modules/antagonists/clockcult/clock_helpers/clock_rites.dm 
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
 2021-03-07 02:06:57 -05:00
Heretical Lizard
9787c02258 Update code/modules/mob/living/living_defense.dm 
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
 2021-03-07 02:06:18 -05:00
Dan-Neposh
ca2f302d69 Rewords Nar'Sies death annoucement 2021-03-04 10:51:44 -05:00
Dan-Neposh
d9d3468ce0 Fixes Ratvars linters 2021-03-04 08:05:44 -05:00
Dan-Neposh
b2f80555bb hopefully fixes run linters, as well as rewords some announcements 2021-03-04 01:58:36 -05:00
Dan-Neposh
2ec2f55eb7 updates fork 2021-02-17 12:03:28 -05:00
Dan-Neposh
ace2512812 solves run linter errors 2021-02-17 10:24:37 -05:00
Putnam3145
d1a6fa972f Merge pull request #14254 from BlueWildrose/holodick 
Messages admins of certain holodeck actions
 2021-02-17 07:21:41 -08:00
Putnam3145
74e6f9198b Merge pull request #14236 from dzahlus/toxic-objective-removal 
Removes prevent from leaving alive, maroon objective
 2021-02-17 05:35:27 -08:00
silicons
e009b9ef5f Merge pull request #14186 from SmArtKar/trading_card_game 
[READY][PORT] Codename: Blue Eyes White Jumpsuit, the Citadel TCG. Part 1
 2021-02-17 01:30:13 -07:00
SmArtKar
598c19996c Oopsie 2021-02-16 19:53:27 +03:00
SmArtKar
e4afe49687 Adds card crafting!" 2021-02-16 19:38:48 +03:00
SmArtKar
664f81585b Adds undef 2021-02-16 19:11:04 +03:00
SmArtKar
0e1e3aaaed and more 2021-02-16 18:57:43 +03:00
SmArtKar
799917bc70 and more 2021-02-16 16:24:37 +03:00
SmArtKar
8abce43547 Fixes 2021-02-16 16:04:31 +03:00
SmArtKar
3da4c73fbe Slight changes to balance, new cards 2021-02-16 15:57:05 +03:00
SmArtKar
cf76b9d740 Fixes card saving, fixes some icons, adds rulebook 2021-02-16 12:12:20 +03:00
Blue Wildrose
99a1991e0a Messages admins of certain holodeck actions 2021-02-15 19:55:05 -07:00
Lin
975c98731e Merge pull request #14242 from timothyteakettle/age-gate-2-electric-boogaloo 
age gate 2 electric boogaloo
 2021-02-15 18:16:44 -06:00
Lin
cef0226b0b Merge pull request #14244 from silicons/botany_logging 
streamlining botany logging, adds english_list_assoc
 2021-02-15 14:22:36 -06:00
SmArtKar
2b46d87742 Packs now put cards into your hand 2021-02-15 21:15:08 +03:00
SmArtKar
3ba4a9d670 FUCKING FINALLY 2021-02-15 21:02:54 +03:00
SmArtKar
924cfd1007 i hate this PR 2021-02-15 20:25:27 +03:00
SmArtKar
c89a3c073a reeeee 2021-02-15 20:19:43 +03:00
SmArtKar
893f5b42e7 I hate trigonometry so here you go, propper formula for card rotation 2021-02-15 20:10:17 +03:00
SmArtKar
375a6891bf Adds new nuclear cards 2021-02-15 19:44:47 +03:00
Lin
142be853dc Merge pull request #14245 from silicons/sprint_staging 
adds config entry for sprint removal that works prettier than just setting sprint speed to 0
 2021-02-14 22:52:44 -06:00
Lin
62fe42513b Merge pull request #14096 from Citadel-Station-13/silicons-patch-27 
makes people on the ground punch less hard. completely removes punch rng miss.
 2021-02-13 23:30:00 -06:00
silicons
43174501de final tweaks 2021-02-13 20:47:38 -07:00
silicons
2ef33c5c88 sprint updates 2021-02-13 20:24:26 -07:00
Lin
b42ca71b00 Merge branch 'master' into virus_logging 2021-02-13 21:20:09 -06:00
Lin
32770ed0d3 Merge pull request #14241 from silicons/logging 
fixes href logging prefiltering of chat pings, removes extraneous newlines from verbose tgui logging
 2021-02-13 21:17:37 -06:00
silicons
4a0adc49f6 mod 2021-02-13 20:00:28 -07:00
silicons
61ab2a5a53 logging fixes 2021-02-13 19:47:17 -07:00
timothyteakettle
b2588c5d57 Update new_player.dm 2021-02-14 02:11:07 +00:00
silicons
0aea43afcc Merge pull request #14224 from DeltaFire15/no-more-YELLING 
Makes clockies yell less
 2021-02-13 19:06:57 -07:00
silicons
5990a3ad4b Merge pull request #14227 from Adelphon/polycloth 
CLOAK, PARKA, COLORFUL SHOES
 2021-02-13 19:06:46 -07:00
silicons
aeb9b1e06c Merge pull request #14233 from DeltaFire15/armwrap-kneecap 
About unarmed parrying..
 2021-02-13 19:06:39 -07:00
silicons
3b441bfd28 kay 2021-02-13 19:03:27 -07:00