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

15460 Commits

Author SHA1 Message Date
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
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
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
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
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
Timothy Teakettle
b06948bed4 fry smite 2020-07-20 17:48:37 +01:00
Timothy Teakettle
eab0ae8af0 small changes 2020-07-20 17:20:54 +01:00
Keate Senior
30e96eb062 makes various structures work better for a station based mode 
Also updates scripture descriptions to not be from the old version of the mode
 2020-07-20 03:26:41 -04:00
Keate Senior
21af6d4805 same as last commit but I actually stage all the right files 2020-07-20 03:20:13 -04:00
Keate Senior
beb6dd6e08 scripture changes and new marauder variant 
The Ark summoning scripture is being temporarily moved to applications until I can fix it not showing up in a new UI tab, as well as adds the Clockwork Guardian, a marauder variant that acts similar to holoparasites/guardian spirits in the sense that they're linked to a host. slower than normal marauders but with more health, they can automatically block and counter any melee attack, and heal their host up to a small amount if the host is heavily injured (65% health)
 2020-07-20 03:16:03 -04:00
Heretical Lizard
7e836837f9 Merge pull request #4 from DeltaFire15/COGGERS 
Stablegateway stuff from Deltafire but I put it in my own repo
 2020-07-20 03:04:44 -04:00
timothyteakettle
e2b68797b7 bugfixes 2020-07-20 00:49:00 +01:00
BlackMajor
f265b85d3b Merge pull request #12810 from lolman360/master 
service borg fix/tweak
 2020-07-20 11:42:59 +12:00
timothyteakettle
8709a72fc0 fry everything 2020-07-20 00:40:18 +01:00
kappa-sama
ba15c17e02 here 2020-07-19 15:14:44 -04:00
kappa-sama
26a240ddb9 bye 2020-07-19 15:14:12 -04:00
Lin
f2e0e5c247 Merge pull request #12814 from Citadel-Station-13/silicons-patch-35 
fixes gateways switching to active power use when thy should not be using power at all
 2020-07-19 11:10:51 -05:00
Kraseo
7094649881 don't like this 2020-07-19 11:30:55 +02:00
kappa-sama
38f05bf230 6 because i feel like it 2020-07-19 04:37:51 -04:00
kappa-sama
6075af8eb0 nerfies 2020-07-19 04:28:44 -04:00
Artur
de5e87d522 Fixes a typo 2020-07-19 02:37:11 +03:00
Lin
ba3dc6a73b Merge pull request #12679 from silicons/unarmed_parry 
Ok ok hear me out: Implements unarmed parry.
 2020-07-18 17:02:02 -05:00
silicons
56f56d5cbe Update gateway.dm 2020-07-18 10:24:36 -07:00
Lin
e165524763 Merge pull request #12803 from Citadel-Station-13/silicons-patch-32 
removes tango dancing
 2020-07-18 11:17:42 -05:00
kappa-sama
0364fe8579 lower cost 2020-07-18 03:50:17 -04:00