Commit Graph

1687 Commits

Author SHA1 Message Date
kevinz000
2139bfdb5f Merge pull request #11290 from Putnam3145/traitor-types
Traitor classes: a new paradigm.
2020-03-15 01:35:30 -07:00
kevinz000
a21458bba6 Merge pull request #11437 from keronshb/BlobBuffPort
Ports Blob Buffs
2020-03-14 09:10:54 -07: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
kevinz000
69c21f4b76 Merge pull request #10327 from Seris02/tggenetics
ports tg genetics
2020-03-11 17:01:37 -07:00
Ghom
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
kevinz000
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
7578d60436 flavor texts unset on randomize, yay. 2020-03-10 15:11:16 +01: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
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
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
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
kevinz000
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
kevinz000
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
kevinz000
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
kevinz000
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
deathride58
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
Ghom
5e4f8dc6a0 Merge pull request #11181 from Detective-Google/big-chode-energy
changes sausage girth from circumference -> diameter
2020-03-04 23:49:58 +01:00
Ghom
7a2e0892d3 Merge pull request #11277 from kevinz000/sword_point
En garde! (nah just sword pointing)
2020-03-04 17:11:39 +01:00
Ghommie
f2c8a7cd6f Porting a couple material datums code updates and fixes. 2020-03-04 15:59:46 +01:00
kevinz000
b2be57d5fe macro recursion woops 2020-03-03 20:43:54 -07:00
kevinz000
8b0b685fa7 CHECK_MOBILITY 2020-03-03 20:40:33 -07:00
deathride58
9efdad1d6b Initial commit - lays out the foundation for a more robust limb icon override system. You're welcome. 2020-03-03 13:55:33 -05:00
kevinz000
1e99cd0bfe Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-03-03 03:08:41 -07:00
Kraseo
ad8013d839 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into contracties 2020-03-01 23:39:16 +01:00
Kraseo
38f7821dd6 part 1: battle stream 2020-03-01 16:56:13 +01:00
kevinz000
9a3ddaaf7b Update logging.dm 2020-03-01 07:08:04 -07:00
Putnam
31b9dbd4ab Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into traitor-types 2020-02-29 23:30:36 -08:00
Putnam
f344af633f finalized. 2020-02-29 23:29:24 -08:00
kevinz000
93d91b1808 Merge remote-tracking branch 'citadel/master' into sword_point 2020-02-28 13:39:56 -07:00
kevinz000
8ef68fa36b En garde! 2020-02-28 13:35:41 -07:00
kevinz000
e39d7fa49d Merge pull request #11259 from Ghommie/Ghommie-cit590
Porting update_icon improvements.
2020-02-28 04:30:12 -07:00
kevinz000
56eab760fc Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-27 20:11:36 -07:00
Detective-Google
1f88a22d04 Merge branch 'master' into big-chode-energy 2020-02-27 16:39:57 -06:00
Detective Google
b7aad30d3c girth -> diameter 2020-02-27 16:38:14 -06:00
kevinz000
19962493a9 Merge pull request #11241 from Arturlang/Solar_updates
Ports TGs Solar updates.
2020-02-27 01:03:52 -07:00