shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
35,735 Commits 5 Branches 0 Tags
daed810c3ae11f441a18a96209ec6e0943dfef1d
Commit Graph

23471 Commits

Author SHA1 Message Date
Keate Senior
daed810c3a I didn't get to see if it'd still conflict with the clickdelay testmerge 
ugghh I shouldn't be coding when my second brain cell falls asleep but hey at least the change is incredibly small
 2020-07-28 12:59:34 -04:00
Keate Senior
e8d4d5b053 Revert "Revert "Revert "THIS COMMIT IS PURELY SO IT WORKS WITH KEVINS CLICKDELAYS #12834""" 
This reverts commit 0e6fe357da.
 2020-07-28 05:00:13 -04:00
Keate Senior
0e6fe357da Revert "Revert "THIS COMMIT IS PURELY SO IT WORKS WITH KEVINS CLICKDELAYS #12834"" 
This reverts commit 4b876ef9fb.
yo hol up I gotta see if the confliction is fixed first
 2020-07-28 04:59:58 -04:00
Keate Senior
4b876ef9fb Revert "THIS COMMIT IS PURELY SO IT WORKS WITH KEVINS CLICKDELAYS #12834" 
This reverts commit 7e1cab15ae.
 2020-07-28 04:07:41 -04:00
Keate Senior
7e1cab15ae THIS COMMIT IS PURELY SO IT WORKS WITH KEVINS CLICKDELAYS #12834 
REVERT IF CLICKDELAYS ARE UN-TESTMERGED
 2020-07-28 04:07:01 -04:00
DeltaFire
53482e6bd6 modifies the ark, aswell as changing a tiny bit of stuff for stable gateways 
The ark no longer immediately activates when summoned. Instead, an cultist needs to activate it. Once on, it cannot be turned off again save by destroying it.

Also, the stable-gateway deactivation doafter now has an actual beam-animation.
 2020-07-27 00:52:35 +02:00
DeltaFire
93672ea1e4 modifies the ark to not immediately activate and purges some todos 
Tin
 2020-07-26 23:00:29 +02:00
Keate Senior
5fb64c38e8 Makes the god fight cooler by adding new quotes and some sound changes 2020-07-26 03:58:52 -04:00
Keate Senior
7fd93ecd7d description edits/Ratvar calling you out for trying to make another Ark 
makes the Ark's description fit for a station based setting, and makes Ratvar have a nicer tone when talking to someone trying to summon another ark after he's spawned already
 2020-07-26 03:57:32 -04:00
Keate Senior
49b97f2ea2 increases the penalty for off-station scripture recital to x3 cost/time 2020-07-26 03:54:22 -04:00
Keate Senior
f2ef4def24 Buffs some of the available scriptures for clock cult borgs 
engineering borgs get a focus on the structures
combat oriented borgs get more combat spells IE: belligerent and volt blaster
mediborgs get mending mantra
comments out the janitor slab things, to mirror the janiborg being commented out
 2020-07-26 03:52:35 -04:00
Keate Senior
01c31c1ce4 My illiteracy knows no bounds 2020-07-25 15:31:26 -04:00
Keate Senior
18bdf83136 God I hate travis, will this appease you? 2020-07-24 14:47:53 -04:00
Keate Senior
8473a0291d Revert "/probably/ gets Travis to stop shouting about guardians" 
This reverts commit be9723678e.
 2020-07-24 12:05:50 -04:00
Keate Senior
e6d7327387 Revert "makes Travis not yell at marauders I don't know they worked fine /shrug" 
This reverts commit edd68c5174.
 2020-07-24 12:05:36 -04:00
Keate Senior
be9723678e /probably/ gets Travis to stop shouting about guardians 2020-07-23 23:46:10 -04:00
Keate Senior
14ff477fa1 Revert "Makes Ratvar spawn above the Ark" 
This reverts commit e4ae613434.
 2020-07-23 22:38:04 -04:00
Keate Senior
edd68c5174 makes Travis not yell at marauders I don't know they worked fine /shrug 2020-07-23 22:35:48 -04:00
Keate Senior
e4ae613434 Makes Ratvar spawn above the Ark 2020-07-23 17:49:14 -04:00
Keate Senior
fafde35ee2 Fixes the Arks looping issue, and gives Ratvar new words when fighting 
Also removes the grace period variable since the ark activates immediately now /shrug
 2020-07-23 12:59:40 -04:00
Keate Senior
7f652cf338 updates the UI so it works with TGUI3 2020-07-23 06:38:47 -04:00
silicons
f3efa19436 Merge remote-tracking branch 'citadel/master' into 12742 2020-07-21 11:25:26 -07:00
silicons
aa3cc9fae8 Merge pull request #12824 from kappa-sama/patch-35 
makes brainwashing disk role restricted and debuffs its price
 2020-07-20 17:25:53 -07:00
Lin
b6f689b06d Merge pull request #12843 from Citadel-Station-13/silicons-patch-40 
uhhhhhhh ok nothing to see here let's fix spell packets this time again
 2020-07-20 19:05:28 -05:00
silicons
3d2995b4e8 Merge pull request #12787 from CameronWoof/advanced-sutures-and-mesh 
Ports Medicated Sutures and Advanced Regenerative Mesh from TG
 2020-07-20 17:01:32 -07:00
silicons
a7144d2404 Merge pull request #12829 from timothyteakettle/fried-component 
the fried component
 2020-07-20 16:59:36 -07:00
silicons
7df369e5d7 Merge pull request #12811 from kappa-sama/patch-33 
removes the 2 best weapons in the game from traitor uplink's 10tc surgery bag
 2020-07-20 16:58:01 -07:00
silicons
1d99591b6b Merge pull request #12807 from kappa-sama/patch-32 
lowers stray cargo pod weight from 2x normal to 1/2 normal
 2020-07-20 16:57:24 -07:00
silicons
9bb92f8d4d Merge pull request #12805 from SiliconMain/patch-1 
This is stupid
 2020-07-20 16:56:57 -07:00
silicons
3f2cab02eb Merge pull request #12826 from Kraseo/instastuns-bad 
Makes damp rags no longer instantly apply chemicals
 2020-07-20 16:56:22 -07:00
silicons
947b050c47 Merge pull request #12804 from Arturlang/decal_painter_fix 
Decal Painter ui fix
 2020-07-20 16:55:38 -07:00
silicons
c7022445b5 Merge pull request #12800 from DeltaFire15/swarmer-fix 
Fixes swarmers not being able to eat any items at all
 2020-07-20 16:55:00 -07:00
silicons
fefc0530b8 Merge pull request #12795 from TheSpaghetti/patch-3 
Makes extradimensional oranges weirder. [/TG/ PORT]
 2020-07-20 16:54:43 -07:00
silicons
448706d540 Merge pull request #12749 from TheSpaghetti/patch-2 
Adds monophobia quirk.
 2020-07-20 16:54:25 -07:00
silicons
4d4133a8da Merge pull request #12819 from Arturlang/bloodsucker_typo 
Fixes a bloodsucker lair typo
 2020-07-20 16:53:42 -07:00
silicons
2ec64f3e05 Update wizard.dm 2020-07-20 16:50:56 -07:00
Lin
210b7b281c Merge pull request #12727 from Citadel-Station-13/silicons-patch-19 
bandaids around turnstiles being bad code until it can have its movement checks refactored
 2020-07-20 18:25:01 -05:00
Lin
7adae61ade Merge pull request #12773 from Citadel-Station-13/silicons-patch-28 
jexp exemption now also exempts from antag days remaining locks
 2020-07-20 18:22:42 -05:00
Lin
923b4cbb4f Merge pull request #12823 from Citadel-Station-13/gravity_update 
gravity now immediately updates on entering/exiting areas with different gravity and space meaning no more slow for 4 seconds while in a hardsuit and then fast with jetpack
 2020-07-20 18:21:55 -05:00
Lin
f0df3689dc Merge pull request #12790 from Citadel-Station-13/silicons-patch-30 
truncates sdql2 output to 2500 objects instead of 20000 because it's a real epic gamer moment when admins crash their clients doing SELECT /datum/gas_mixture
 2020-07-20 18:20:27 -05:00
Lin
67a6330e77 Merge pull request #12786 from silicons/survivalists 
makes survivalists pseudoantags again and limits summon guns/magic to one use
 2020-07-20 18:20:08 -05:00
Lin
f7355dde62 Merge pull request #12728 from silicons/vote 
"I didn't see the map vote" - Adds a stat vote panel for plurality and approval voting as an alternative to the regular popups.
 2020-07-20 18:17:45 -05:00
silicons
267186a5d3 Merge pull request #12646 from Chiirno/emi 
[READY] Alt-click cigarette pack functionality added to pill bottles.
 2020-07-20 16:15:38 -07:00
Keate Senior
ecb9a430eb Stable gateways and integration cog QoL by DeltaFire 
APC interfaces now lock after being cogged, and Reebe can only be accessed by stabilizing/linking an obelisk with the one in reebe
 2020-07-20 16:57:23 -04:00
Timothy Teakettle
4b70e29e36 let the fry smite work 2020-07-20 19:42:07 +01:00
silicons
dec84af233 Merge pull request #12830 from Funce/genetic-spider-fix 
Fixes genewebs being impossibly impassable
 2020-07-20 10:49:10 -07:00
Timothy Teakettle
b06948bed4 fry smite 2020-07-20 17:48:37 +01:00
Timothy Teakettle
a0c166c490 badmin safeguarding 2020-07-20 17:43:58 +01:00
Timothy Teakettle
c68f0559d9 old instant eating speed 2020-07-20 17:29:09 +01:00
Timothy Teakettle
eab0ae8af0 small changes 2020-07-20 17:20:54 +01:00