shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
32,190 Commits 5 Branches 0 Tags
a6ca854e5cc4a352ac34f55329daec2964eecdff
Commit Graph

1124 Commits

Author SHA1 Message Date
kevinz000
a6ca854e5c Merge remote-tracking branch 'citadel/master' into shield_refactor 2020-03-22 15:07:41 -07:00
Putnam3145
368d47aa69 Adds ghost role eligibility to various ghost roles. (#11549) 
* Added ghost role eligibility to CTF, possession, random animal

* Also added possessed blade to it.

* Also removed some extraneous dead/observer things.

* ahaha whoops
 2020-03-22 13:02:23 +01:00
kevinz000
6754b794b1 Merge remote-tracking branch 'citadel/master' into shield_refactor 2020-03-20 22:59:17 -07:00
Putnam3145
9523954c4d Rewrote waffle traitor flavor text (#11539) 
* Rewrote waffle flavor text

* and not in custody
 2020-03-20 15:47:46 +01:00
kevinz000
8b0600a7fa Merge pull request #11527 from Ghommie/Ghommie-cit628 
More bug reports yee'd their last haw.
 2020-03-19 18:56:32 -07:00
Seris02
ea8941343e stops validhunting geneticists from knowing exactly who is an is a vampire (and allows vampires genes) (#11520) 
* yeet gone

* pfft oof

* oof
 2020-03-19 13:40:11 +01:00
Ghommie
32975bf509 More bug reports yee'd their last haw. 2020-03-18 23:43:23 +01:00
kevinz000
9bd275e430 Merge remote-tracking branch 'citadel/master' into shield_refactor 2020-03-16 13:47:53 -07:00
kevinz000
ceb3d39266 k 2020-03-16 12:51:30 -07:00
kevinz000
7a25e04324 bet 2020-03-16 11:15:11 -07:00
kevinz000
d3724d5fbd f 2020-03-16 10:59:34 -07:00
kevinz000
26ee02ef39 dab 2020-03-16 10:52:23 -07:00
kevinz000
a929fa1e8d s 2020-03-16 10:46:56 -07:00
kevinz000
e3301f8722 bet 2020-03-16 10:44:02 -07:00
kevinz000
6af9c54da5 better 2020-03-16 04:59:55 -07:00
kevinz000
a77be038b8 refactoring this whole thing again 2020-03-16 04:56:32 -07:00
kevinz000
763c835a53 bitflags not equals 2020-03-16 04:26:19 -07:00
kevinz000
857f793600 ok 2020-03-16 04:12:54 -07:00
kevinz000
644273beca k 2020-03-16 04:09:25 -07:00
kevinz000
94db06509c slight desword reflect meme buff 2020-03-16 03:50:26 -07:00
kevinz000
2139bfdb5f Merge pull request #11290 from Putnam3145/traitor-types 
Traitor classes: a new paradigm.
 2020-03-15 01:35:30 -07:00
kevinz000
2113b63428 o boy 2020-03-14 21:42:23 -07:00
Kraseo
d34d46f00d i think you're a thief cause you stole my heart, stole my heart, trapped my soul like azura's star (#11461) 2020-03-15 04:03:50 +01:00
kevinz000
a21458bba6 Merge pull request #11437 from keronshb/BlobBuffPort 
Ports Blob Buffs
 2020-03-14 09:10:54 -07:00
Putnam3145
d9dc91db1a More dynamic fixes (#11451) 
* Fixed wizard, malf AI

* changed memes typename to story

* Fixed a bunch of really weird execute/ready confusion

* Added dynamic requirement to wands.
 2020-03-14 02:49:25 +01:00
Putnam
b1a94f7667 Made hijack, martyr more common 2020-03-12 15:05:53 -07:00
Putnam
ae94083dbe Added more explanation to hijack. 2020-03-12 14:59:04 -07:00
Ghom
9e3a3dddfd Merge pull request #11429 from Putnam3145/dynamic-tweaks 
Dynamic tweaks/fixes
 2020-03-12 14:20:28 +01:00
kevinz000
69c21f4b76 Merge pull request #10327 from Seris02/tggenetics 
ports tg genetics
 2020-03-11 17:01:37 -07:00
keronshb
148e935c41 Fixes jump to node 
ports this fix too
 2020-03-11 17:39:08 -04:00
keronshb
f5d2a04833 Ports Blob Buffs 
Ports blob buffs from TG
 2020-03-11 17:33:27 -04:00
Putnam
8db3a3ced4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into dynamic-tweaks 2020-03-11 02:17:16 -07:00
Putnam
621ea62d64 Added swarmers, portal storm, wormholes to dynamic. 2020-03-10 23:21:47 -07:00
kevinz000
0791f22b62 Merge pull request #10702 from Ghommie/Ghommie-cit528 
Hey, do you remember that wizard round where everyone tried arming up the nuclear bomb and we all went DELTA RED DELTA RED DELTA RED DELTA ?
 2020-03-10 17:24:48 -07:00
kevinz000
e210f7d535 Merge pull request #11391 from Ghommie/Ghommie-cit612 
Porting "Further update_icon splitup"
 2020-03-10 05:58:17 -07:00
kevinz000
bfb75eb26b Merge pull request #11396 from Ghommie/Ghommie-cit613 
Ports "Switches out the three billion args of electrocute act for flags"
 2020-03-10 05:56:28 -07:00
kevinz000
bd2aa5f54b Merge pull request #11402 from Ghommie/Ghommie-cit614 
Porting more legcuffs / bola fixes etcetera
 2020-03-09 21:01:51 -07:00
Putnam
5a18d143a9 Removed extraneous apply_innate_effects 
This one was caused by the hear proc overhaul.
 2020-03-09 18:47:42 -07:00
Putnam
f19647acc7 Fixed uplinks not being given to traitors. 
Always remember to follow your code VERY CLOSELY or garbage like this happens. finalize_traitor calls traitor_kind.finalize_traitor(); that's how I intended it to happen. Instead, I foolishly wrote "traitor_kind.finalize_traitor()" in the on_gain() proc. I didn't notice for a LONG time, because... well, it's supposed to call finalize_traitor(), just not that one. The pitfalls of working with old code.
 2020-03-09 18:47:06 -07:00
Ghom
29346f7827 Merge pull request #11371 from keronshb/BlobRefactor 
Blob refactor + reroll ports
 2020-03-09 17:07:45 +01:00
Ghommie
4143c1963c Porting more legcuffs / bola fixes etcetera 2020-03-09 16:20:51 +01:00
Seris02
cccd0e9eef Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics 2020-03-09 16:49:32 +08:00
kevinz000
3da09077ec Merge pull request #11393 from Citadel-Station-13/Ghommie-patch-1 
Webedit fixing bloodsucker mesmerize
 2020-03-08 21:29:10 -07:00
Ghommie
ee1eea8874 Ports "Switches out the three billion args of electrocute act for flags" 2020-03-09 04:01:23 +01:00
keronshb
fd1dc991ce Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into BlobRefactor 
Pne more test go
 2020-03-08 19:48:30 -04:00
Ghom
1c5aa2f933 Merge pull request #11377 from Kraseo/contractor-fixes 
Some contractor adjustments & fixes
 2020-03-09 00:26:54 +01:00
Ghom
8878733fc1 Merge pull request #11317 from deathride58/WEPORTINSYNTHSBOI 
Ports Skyrat's synths (Plus limb rendering overhaul and more)
 2020-03-09 00:26:06 +01:00
Ghom
187de6869f Webedit fixing bloodsucker mesmerize 2020-03-08 23:38:30 +01:00
keronshb
0f14fbfdac Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into BlobRefactor 
To fixs something?
 2020-03-08 17:51:17 -04:00
Putnam
eacdc3b438 Let gorlex marauders contract, and made them hijack 2x as fast as other traitors 2020-03-08 14:05:04 -07:00