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

1419 Commits

Author SHA1 Message Date
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
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
4d4133a8da Merge pull request #12819 from Arturlang/bloodsucker_typo 
Fixes a bloodsucker lair typo
 2020-07-20 16:53:42 -07: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
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
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
Artur
de5e87d522 Fixes a typo 2020-07-19 02:37:11 +03:00
Keate Senior
d65f0e956c replaces the abscond default quickbind to gateway default quickbind 2020-07-17 21:54:05 -04:00
silicons
993b4ec222 Merge remote-tracking branch 'citadel/master' into unarmed_parry 2020-07-16 19:39:46 -07:00
silicons
e03948dcba Merge pull request #12229 from Arturlang/TGUI-3.0 
[READY]TGUI 3.0
 2020-07-16 17:28:42 -07:00
DeltaFire
9e05d9f748 fixes swarmers not being able to eat any items 2020-07-16 23:26:46 +02:00
Letter N
abd0ac089d https://github.com/tgstation/tgstation/pull/51687 2020-07-16 20:36:08 +08:00
Keate Senior
17ef5b4742 removes the still unused caches and daemons. 
apparently I didn't /actually/ remove the structures fully but here's the rest of them. Oh well, RIP old clockcult buildings, maybe someone will have a use for you in the future.
 2020-07-16 02:34:20 -04:00
silicons
f653fd5c3c kay 2020-07-15 14:58:51 -07:00
Keate Senior
14384abb59 removes the commented out Geis and Cache summon scriptures 
Geis won't really work well how it is currently, and Caches could be added in the future as a form of storage/delivery system or power generation.
 2020-07-15 00:12:30 -04:00
DeltaFire
8f1e191500 stealthy cogging 
APC locks after cogging, drain gets averted by prioritized powerallocation
 2020-07-14 00:39:21 +02:00
Artur
5f9364c5f8 Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 2020-07-13 16:20:54 +03:00
DeltaFire
c6ea2981f4 oop 2020-07-12 18:57:47 +02:00
DeltaFire
0b0fbc1272 Updates stable gateways 
Changes some stuff around, makes gateways automatically stable if they are a reebe-station obelisk-obelisk gateway
 2020-07-12 18:36:59 +02:00
Keate Senior
80b4c03c82 Initial changes to get this to github for public reviewing 
-Removes the Reebe z level and puts it on the cc z level
-Replaces the Neovgre mech stepsound
-Moves spacial gateway into drivers so the cult isn't stuck stationside
-Adds the Belligerant scripture, which applies the Belligerant status effect to non-clankers in range
-Various other changes currently commented out for later work on them.
-removes the abductor teleport cameras from Reebe
-adds a Brass multitool, essentially just an advanced multitool with a special sprite.
-makes clockcult armor have 0 laser defense normally and 10 defense when the ark is almost done summoning Ratvar instead of -25 --> -15
-Makes spear recalling worded to support the addition of new weapons to summon
-Adds new structures for power generation and shuttle delaying
-Other changes I've probably forgotton, but are too lazy to scrounge through the code at 12:43 AM
 2020-07-12 00:43:54 -04:00
silicons
feddd14176 Merge pull request #12714 from DeltaFire15/sents-compromise-aug 
Fixes / Buffs sentinels compromise to heal augmented bodyparts aswell.
 2020-07-11 00:48:37 -07:00
Keate Senior
928a7a956f Adds things to help the cult become station based 
Adds (or re-adds I guess) the old spells and stuctures from parts based clock cult, soon to be meant for construction/power generation as well as possible QoL things
 2020-07-09 16:30:52 -04:00
silicons
aae496492f Update revenant.dm 2020-07-09 02:22:30 -07:00
DeltaFire
7aa160029f changes sent's healing a bit 
No more killing augmented followers, it heals them aswell. Ratvar is a machine god afterall.
 2020-07-08 23:45:35 +02:00
silicons
6cbab55ef8 Merge remote-tracking branch 'citadel/master' into unarmed_parry 2020-07-07 21:07:58 -07:00
silicons
6ee63f66aa whew 2020-07-07 20:48:54 -07:00
Artur
280d3de6c3 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-07-07 18:37:45 +03:00
Ghom
c5b94a4d00 Update code/modules/antagonists/revenant/revenant.dm 2020-07-04 18:30:01 +02:00
silicons
ca6fc8d813 Update revenant.dm 2020-07-04 06:48:00 -07:00
Artur
6c4e733a38 More testmerge fixes 2020-07-03 15:16:02 +03:00
Artur
6ee1eba56c Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-07-02 23:23:47 +03:00
Artur
f46d0b9409 Clockworkslab, skillpanel, telecoms works now 2020-07-02 23:21:11 +03:00
Artur
20245f7319 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-06-30 02:30:29 +03:00
Ghommie
9dc4b99620 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-06-30 00:49:06 +02:00
Artur
2797aefc3a Clockworkslab and ui resizing 2020-06-30 01:05:43 +03:00
Putnam3145
ee2fedd4af Merge pull request #12390 from Ghommie/Ghommie-cit800 
Porting brain trauma updates: Curse of madness, cloning traumas, random brain trauma event.
 2020-06-29 12:44:33 -07:00
Putnam3145
42809d8b0c Merge pull request #12416 from Ghommie/Ghommie-cit792 
TGUI-next Check Skills menu.
 2020-06-29 12:44:08 -07:00