 kevinz000
|
9bd275e430
|
Merge remote-tracking branch 'citadel/master' into shield_refactor
|
2020-03-16 13:47:53 -07:00 |
|
|
kevinz000
|
e3301f8722
|
bet
|
2020-03-16 10:44:02 -07:00 |
|
|
kevinz000
|
a77be038b8
|
refactoring this whole thing again
|
2020-03-16 04:56:32 -07:00 |
|
|
kevinz000
|
2a9e4bebdd
|
priority
|
2020-03-16 04:24:18 -07:00 |
|
|
kevinz000
|
69374c64c9
|
k
|
2020-03-16 04:18:22 -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
|
09e1be9651
|
block args
|
2020-03-16 03:32:12 -07:00 |
|
|
kevinz000
|
5d2fb654e8
|
k
|
2020-03-16 03:23:09 -07:00 |
|
|
Ghommie
|
f93445aa31
|
.yeH
|
2020-03-15 22:46:32 +01:00 |
|
|
Ghommie
|
15e2cb9cde
|
Hey.
|
2020-03-15 22:45:05 +01:00 |
|
|
Ghommie
|
1fc62b9e99
|
split flags from signals.
|
2020-03-15 22:43:58 +01:00 |
|
|
Ghommie
|
ea30b2fb1a
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit616
|
2020-03-15 22:35:59 +01:00 |
|
|
kevinz000andGitHub
|
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 |
|
|
kevinz000
|
1a061a5d3e
|
agony
|
2020-03-14 21:14:56 -07:00 |
|
|
kevinz000andGitHub
|
a21458bba6
|
Merge pull request #11437 from keronshb/BlobBuffPort
Ports Blob Buffs
|
2020-03-14 09:10:54 -07:00 |
|
|
Ghommie
|
8ccd0d2cbc
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit595
|
2020-03-12 20:31:14 +01:00 |
|
|
Ghommie
|
0876a1eef6
|
Porting datum components system updates.
|
2020-03-12 18:22:26 +01:00 |
|
|
kevinz000
|
6127f6a453
|
k
|
2020-03-11 17:41:12 -07:00 |
|
|
kevinz000andGitHub
|
69c21f4b76
|
Merge pull request #10327 from Seris02/tggenetics
ports tg genetics
|
2020-03-11 17:01:37 -07:00 |
|
|
GhomandGitHub
|
9f681e9a76
|
Merge pull request #11409 from necromanceranne/taser_nerf
Particle Defender no longer just the HoS taser but a shotgun/Stimulants protect against the tased effect.
|
2020-03-12 00:30:52 +01:00 |
|
|
keronshb
|
f5d2a04833
|
Ports Blob Buffs
Ports blob buffs from TG
|
2020-03-11 17:33:27 -04:00 |
|
|
Ghommie
|
d31075eb54
|
Spellcasting element
|
2020-03-11 16:23:30 +01:00 |
|
|
kevinz000andGitHub
|
46823a127b
|
Merge pull request #11335 from Ghommie/Ghommie-cit604
Made flavor texts into an element datum, appliable to every atom.
|
2020-03-10 17:26:20 -07:00 |
|
|
Ghommie
|
2b4b626fac
|
support for items that switch states through update_icon.
|
2020-03-10 16:55:30 +01:00 |
|
|
Ghommie
|
7578d60436
|
flavor texts unset on randomize, yay.
|
2020-03-10 15:11:16 +01:00 |
|
|
kevinz000andGitHub
|
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 |
|
|
necromanceranne
|
e0df350579
|
PD now isn't a HoS taser x3 and has reasonable damage, stimulants actually combat the taser effect instead of you just being completely fucked by the HoS even through adrenals.
|
2020-03-10 23:21:59 +11:00 |
|
|
Ghommie
|
0587d3482d
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit604
|
2020-03-09 21:53:22 +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 |
|
|
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 |
|
|
GhomandGitHub
|
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 |
|
|
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 |
|
|
kevinz000andGitHub
|
2b5f337f06
|
Merge pull request #11365 from Ghommie/Ghommie-cit607
Makes monkey probability of gorillize from radiation exponential.
|
2020-03-08 08:15:11 -07:00 |
|
|
kevinz000andGitHub
|
36f1e952b4
|
Merge pull request #11357 from Ghommie/Ghommie-cit606
Patches some awful integrated circuit examiner runtime errors.
|
2020-03-08 08:14:58 -07:00 |
|
|
Ghommie
|
97315940fe
|
Polychromic element.
|
2020-03-08 01:01:21 +01:00 |
|
|
kevinz000andGitHub
|
02a488f507
|
Merge pull request #11340 from Ghommie/Ghommie-cit605
Porting movespeed modifiers code updates.
|
2020-03-07 03:26:48 -07:00 |
|
|
Putnam
|
023d1d6d97
|
Tweaked weights a bunch
|
2020-03-06 21:40:44 -08:00 |
|
|
Putnam
|
71ac07426a
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into traitor-types
|
2020-03-06 17:03:24 -08:00 |
|
|
keronshb
|
f4e3d75088
|
Blob Reroll
Part of blob reroll
|
2020-03-06 17:37:07 -05:00 |
|
|
Ghommie
|
079fd425e5
|
Makes the monkeys' gorillize chances from radiation exponential.
|
2020-03-06 19:05:45 +01:00 |
|
|
Ghommie
|
5d6eb6f24b
|
Patches some awful integrated circuit examiner runtime errors.
|
2020-03-06 14:56:49 +01:00 |
|
|
Kraseo
|
ad20fb1a0e
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into contracties
|
2020-03-06 11:58:11 +01:00 |
|
|
kevinz000andGitHub
|
16d6ba9e21
|
Merge pull request #11323 from Ghommie/Ghommie-cit600
Porting a couple material datums code updates and fixes.
|
2020-03-06 00:17:21 -07:00 |
|
|
Ghommie
|
0c4af362bc
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit605
|
2020-03-06 04:00:36 +01:00 |
|
|
Ghommie
|
e484f72d7b
|
Ports movespeed modifiers code updates.
|
2020-03-06 03:35:56 +01:00 |
|
|
deathride58andGitHub
|
2e35c09dec
|
Merge pull request #10451 from kevinz000/mobility_flags
Mobility flags + combat rework stuff refactoring, fixes a few edge cases including the Oh Dreaded Xenomorph Hardstuns, etc etc time to break the game
|
2020-03-05 20:03:56 -05:00 |
|
|
Ghommie
|
2cbdae2f0a
|
Made flavor texts into an element datum.
|
2020-03-05 18:46:33 +01:00 |
|