Commit Graph

5697 Commits

Author SHA1 Message Date
silicons
dedb0cb62e Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-19 04:24:42 -07:00
Lin
58dde0f60e Merge pull request #14045 from Citadel-Station-13/silicons-patch-9
gorilla pais
2021-01-18 13:22:51 -06:00
Putnam3145
51fc5ae235 Merge pull request #14053 from Citadel-Station-13/silicons-patch-13
"Make it so you can squeeze someone's hand when you hold it"
2021-01-18 10:17:56 -08:00
silicons
30b1cd82f9 . 2021-01-17 12:02:12 -07:00
silicons
5f117a0331 Update basilisk.dm 2021-01-16 03:15:49 -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
ae290cf5f0 newlines 2021-01-13 16:56:36 -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
f7cadc3293 Merge pull request #14009 from shellspeed1/wing-stuff
Ports a bunch of wings from cit RP and fulpstation [Ready]
2021-01-13 16:47:34 -07:00
silicons
ea07ad6e48 Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-13 15:41:28 -07:00
silicons
33ca6c34a1 Update pai.dm 2021-01-13 14:48:59 -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
shellspeed1
58426beadc readds missing none wings for insects 2021-01-09 16:15:50 -08:00
shellspeed1
679f097e27 resets names 2021-01-09 15:39:50 -08:00
silicons
2525334bb0 smooth movement twaeks 2021-01-09 15:30:56 -08:00
silicons
9733305997 Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-09 14:56:32 -08:00
silicons
e680d58a03 fixes 2021-01-09 14:56:29 -08:00
DeltaFire
bc29b80c94 :lazy: 2021-01-09 22:46:40 +01:00
DeltaFire
648c9f951b bonk 2021-01-09 22:30:09 +01:00
DeltaFire
05f7991981 snap 2021-01-09 20:37:24 +01:00
shellspeed1
773a04e5ea Ports wings 2021-01-09 01:56:56 -08:00
silicons
bffc43e95e fixes 2021-01-08 18:59:26 -08:00
silicons
bd9c979b07 riding datums 2021-01-08 18:48:59 -08:00
DeltaFire
56a2892fd3 sigh 2021-01-08 23:48:32 +01:00
silicons
bd3761d39e proper smooth movement 2021-01-08 10:51:48 -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
silicons
2c8326df35 Merge pull request #13976 from timothyteakettle/bread
i have done nothing but teleport bread for three days
2021-01-08 01:14:54 -07:00
Timothy Teakettle
44667ae1b6 edits 2021-01-07 16:46:42 +00: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
Timothy Teakettle
535dede85b i teleported bread 2021-01-05 22:20:41 +00:00
silicons
c937021b68 Update living_active_parry.dm 2021-01-04 03:17:51 -07: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
silicons
c3e4eed5c7 Merge pull request #13938 from timothyteakettle/funny-synths
anthromorphic synth species
2021-01-03 18:10:06 -07:00
silicons
0555756dde Merge pull request #13946 from uomo91/logfix
[Port] Fixes log collisions
2021-01-03 18:08:39 -07:00
Chiirno
84d311e201 nightmare now oneshots glowshrooms, miner beacons, and console screens. 2021-01-03 02:44:47 -04:00
shellspeed1
c8ce23886c Update code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
2021-01-02 22:10:36 -08:00
DeltaFire
ee6601276d Merge pull request #13935 from Citadel-Station-13/silicons-patch-58
fixes a bug
2021-01-01 08:11:40 +01:00
uomo91
6b0435e7b5 Port. 2021-01-01 00:46:47 -06:00
DeltaFire
38565e0027 Merge pull request #13909 from silicons/twitch_plays
Twitch Plays: Clown Car
2021-01-01 04:14:26 +01:00
silicons
1a027c2fa2 good catch 2020-12-31 13:34:47 -07:00
Timothy Teakettle
166176f3ec synthetic anthromorph species 2020-12-31 19:01:04 +00:00