Commit Graph

2683 Commits

Author SHA1 Message Date
raspy-on-osu a7dd74201c 2 2021-02-04 16:51:06 -05:00
raspy-on-osu 3a3b3966a1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ventcrawling-refactor-fix2 2021-02-04 16:46:37 -05:00
silicons 055b1a1db8 Merge pull request #14183 from timothyteakettle/by-armok-by-beard
dwarf facial hair is no longer randomised
2021-02-04 12:56:01 -07:00
Lin 0dd82df64b Merge pull request #14113 from silicons/piggybacking
fixes piggybacking initial offsets. Also, adds the ability to carry around pAIs, because this totally won't result in more metaclique drama.
2021-01-31 23:33:59 -06:00
timothyteakettle 276dfee0d8 Update dwarves.dm 2021-02-01 01:29:37 +00:00
silicons c554f0567e Update human.dm 2021-01-29 11:57:28 -07:00
raspy-on-osu 8077d72edd more efficient 2021-01-28 18:47:02 -05:00
raspy-on-osu fe499636c3 init 2021-01-28 18:42:45 -05:00
silicons fa2754c0fe Update human.dm 2021-01-27 20:49:56 -07:00
silicons 1c99225fbd Update human.dm 2021-01-27 20:48:07 -07:00
Lin f7c1cdc571 Merge pull request #14112 from silicons/ex_act_3
~~hugboxes~~ fixes the bug (that was probably my fault) that makes 1 dev explosions ALWAYS delete brain
2021-01-27 17:16:44 -06:00
silicons a1e92e55aa Merge pull request #14102 from Hatterhat/somatobuff-50513
[READY] somatoray buff - mutation locks + revolution ray
2021-01-25 23:17:29 -07:00
silicons de8d778f76 Merge pull request #14134 from Arturlang/Give_improvements
[READY]Give Improved
2021-01-25 23:02:03 -07:00
raspy-on-osu f2d9643c75 init 2021-01-24 22:31:39 -05:00
raspy-on-osu 622a3df378 Merge branch 'master' of https://github.com/raspy-on-osu/Citadel-Station-13 into ventcrawl-refactor 2021-01-24 19:21:24 -05:00
Lin 724450822f Merge pull request #14123 from MrJWhit/port-of-Let-Me-Tell-You-A-Story-
Port "Let Me Tell You A Story"
2021-01-24 13:20:03 -06:00
Artur 91cd7378ca Give Improved 2021-01-24 16:05:42 +02:00
silicons bc49224241 Update species.dm 2021-01-22 20:51:24 -07:00
MrJWhit 399d04654a Update alien.dm 2021-01-22 18:57:31 -05:00
silicons f2853ab414 Merge pull request #14103 from Arturlang/give_hotkey
[READY]Give hotkey, but citadel
2021-01-21 01:41:29 -07:00
silicons 34473c2ac7 fix 2021-01-20 16:55:19 -07:00
silicons 996ad0634d fix 2021-01-20 16:16:06 -07:00
silicons 20f06cae0f fix 2021-01-20 16:07:42 -07:00
silicons 235ca8809a uh 2021-01-20 16:04:52 -07:00
silicons e06f0bbc72 fixes 2021-01-20 16:01:09 -07:00
silicons 5afe3bbb6f Merge remote-tracking branch 'citadel/master' into ex_act_3 2021-01-20 15:15:10 -07:00
silicons f6eca7afad hugboxy shit 2021-01-20 15:06:53 -07:00
Artur 745c825205 Give hotkey, but citadel 2021-01-20 04:21:57 +02:00
Hatterhat e006587f4b today i will not test my code 2021-01-19 17:24:33 -06:00
silicons dedb0cb62e Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-19 04:24:42 -07:00
silicons a9b3e6a514 Update carbon_defense.dm 2021-01-14 04:33:15 -07:00
silicons 05fcd10506 Update carbon_defense.dm 2021-01-13 22:46:01 -07:00
silicons 1188431bcb Update carbon_defense.dm 2021-01-13 22:40:13 -07:00
silicons 82cc5da8df Merge pull request #14034 from DeltaFire15/blindness-edgecase-fix
Fixes some edge cases regarding system corruption
2021-01-13 16:53:17 -07:00
silicons 310a631ffa Merge pull request #14025 from DeltaFire15/synth-robotics-revival
More Synth tweaks
2021-01-13 16:48:05 -07:00
silicons ea07ad6e48 Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-13 15:41:28 -07:00
Lin 04c5d34cb6 Merge pull request #14015 from DeltaFire15/synth-stuffs
Tweaks some Synth damage stuff
2021-01-13 18:40:03 +00:00
Hatterhat cb40ad4764 atomization is cowardice actually 2021-01-12 16:08:17 -06:00
DeltaFire c9e735b6b4 edge cases 2021-01-12 21:18:33 +01:00
DeltaFire 2b1d79dae0 synth medstuff 2021-01-11 02:11:30 +01:00
silicons 2525334bb0 smooth movement twaeks 2021-01-09 15:30:56 -08:00
silicons e680d58a03 fixes 2021-01-09 14:56:29 -08:00
DeltaFire 05f7991981 snap 2021-01-09 20:37:24 +01:00
silicons bd9c979b07 riding datums 2021-01-08 18:48:59 -08:00
silicons ddad368d6a Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-08 00:33:57 -08:00
Putnam3145 5cde6e0157 Merge pull request #13871 from silicons/debris
Merry Christmas - GIVING JANITORS A JOB
2021-01-08 00:26:52 -08:00
shellspeed1 0144a06964 Removes language to be done later 2021-01-06 11:59:37 -08:00
shellspeed1 98f8af853c Minor xenohybrid changeschanges
Adds wings, xeno tongue, and makes xenomorphs speak xenohybrid by default
2021-01-06 01:58:58 -08:00
silicons 3897463f0b Merge pull request #13955 from Chiirno/NightmareLightsout
Nightmare Lights Damage Buff
2021-01-03 18:15:00 -07:00
silicons 092e7569c2 Merge pull request #13932 from shellspeed1/Ports-xeno-QOL-stuff
Ports xenomorph plasma usage in power description from bee
2021-01-03 18:11:18 -07:00